Skip to content

Commit

Permalink
Preparing for 1.5 release
Browse files Browse the repository at this point in the history
Added MSBuildCommunityTasksPath msbuild property to allow building without requiring the MSBuild Community Tasks to be installed
Added WinDDK 7600.16385.1, and importing msi.props in projects to set up additional include and library directories to allow building without Visual Studio 2010 to be installed
Updated atlbase.h to fix warning LNK4254: section 'ATL' (50000040) merged into '.rdata' (40000040) with different attributes
Added doxygen 1.8.5 to allow building without requiring doxygen to be installed
Using "localhost" for the DSN ODBC SQL Server address and explicitly specifying the default port number to support accessing a named instance from the default port without specifying the instance name
Added appveyor.yml
  • Loading branch information
icnocop committed Sep 18, 2015
1 parent 613a80f commit d8898d0
Show file tree
Hide file tree
Showing 247 changed files with 183,426 additions and 9 deletions.
7 changes: 6 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
### 1.5 (Next Release)
### 1.5 (9/18/2015)

* **Features**:
* Added `SERVICE_NAME` as an alternative property for specifying service name in Service_Change... calls - [@vladaver](https://github.com/vladaver).
Expand All @@ -8,6 +8,11 @@
* [#9](https://github.com/dblock/msiext/issues/9) - Fixed build failures if WiX Toolset v3.7 or MSBuild Community Tasks are not installed - [@icnocop](https://github.com/icnocop).
* **Misc**:
* [#5](https://github.com/dblock/msiext/pull/5) - Fixed WiX UI extension screens: texts, icons, margins, spacing - [@romanws](https://github.com/romanws).
* [#22](https://github.com/dblock/msiext/issues/22) - Added MSBuildCommunityTasksPath msbuild property to allow building without requiring the MSBuild Community Tasks to be installed
Added WinDDK 7600.16385.1, and importing msi.props in projects to set up additional include and library directories to allow building without Visual Studio 2010 to be installed
Updated atlbase.h to fix warning LNK4254: section 'ATL' (50000040) merged into '.rdata' (40000040) with different attributes
Added doxygen 1.8.10 to allow building without requiring doxygen to be installed
Using "localhost" for the DSN ODBC SQL Server address and explicitly specifying the default port number to support accessing a named instance from the default port without specifying the instance name - [@icnocop](https://github.com/icnocop)

### 1.4.1114.0 (11/14/2013)

Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ This is an open source project, please contribute.
* SQL DMO from SQL 2005 Backward Compatibility Components
* Java Development Kit 32-bit
* [MSXML4 SP3](http://www.microsoft.com/en-us/download/details.aspx?id=15697)
* [Doxygen 1.85](http://ftp.stack.nl/pub/users/dimitri/doxygen-1.8.5-setup.exe)
* [Doxygen 1.8.5](http://ftp.stack.nl/pub/users/dimitri/doxygen-1.8.5-setup.exe)

#### Build Project

Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ AppSecInc. Community MSI Extensions is a collection of MSI custom actions and WI
Essentials
----------

* [Download v. 1.4](http://code.dblock.org/downloads/msiext/msiext-1.4.zip)
* [v. 1.4 Documentation](http://dblock.github.com/msiext/docs/1.4/)
* [Download v1.5](https://github.com/dblock/msiext/releases/download/1.5/msiext-1.5.zip)
* [v1.5 Documentation](http://dblock.github.com/msiext/docs/1.5/)
* [Lots of MSI Demos](src/Demos)
* [Need Help? Google Group](https://groups.google.com/group/msiext)
* [Old CodePlex Site](http://msiext.codeplex.com)
Expand Down
147 changes: 147 additions & 0 deletions appveyor.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,147 @@
version: '{build}'
init:
- ps: >-
# MSXML 4.0 Service Pack 3 (Microsoft XML Core Services)
Write-Host "Downloading MSXML 4.0 Service Pack 3 (Microsoft XML Core Services)..." -ForegroundColor Green
$msiFilePath = "$($env:USERPROFILE)\msxml.msi"
$logFilePath = "$($env:TEMP)\msxml.txt"
(New-Object Net.WebClient).DownloadFile('http://download.microsoft.com/download/A/2/D/A2D8587D-0027-4217-9DAD-38AFDB0A177E/msxml.msi', $msiFilePath)
$process = (Start-Process -FilePath "msiexec.exe" -ArgumentList "/i $msiFilePath /quiet /l*v $logFilePath" -Wait -Passthru)
$exitCode = $process.ExitCode
if ($exitCode -ne 0)
{
Get-Content $logFilePath
throw "Command failed with exit code $exitCode."
}
del $msiFilePath
del $logFilePath
Write-Host "MSXML 4.0 Service Pack 3 (Microsoft XML Core Services) installed successfully" -ForegroundColor Green
# SQL DMO from SQL 2005 Backward Compatibility Components
Write-Host "Downloading SQL DMO from SQL 2005 Backward Compatibility Components..." -ForegroundColor Green
$msiFilePath = "$($env:USERPROFILE)\SQLServer2005_BC_x64.msi"
$logFilePath = "$($env:TEMP)\SQLServer2005_BC_x64.txt"
(New-Object Net.WebClient).DownloadFile('http://download.microsoft.com/download/3/1/6/316FADB2-E703-4351-8E9C-E0B36D9D697E/SQLServer2005_BC_x64.msi', $msiFilePath)
$process = (Start-Process -FilePath "msiexec.exe" -ArgumentList "/i $msiFilePath /quiet /l*v $logFilePath" -Wait -Passthru)
$exitCode = $process.ExitCode
if ($exitCode -ne 0)
{
Get-Content $logFilePath
throw "Command failed with exit code $exitCode."
}
del $msiFilePath
del $logFilePath
Write-Host "SQL DMO from SQL 2005 Backward Compatibility Components installed successfully" -ForegroundColor Green
# Source: http://geekswithblogs.net/TedStatham/archive/2014/06/13/setting-the-ports-for-a-named-sql-server-instance-using.aspx
# Set the $instanceName value below to the name of the instance you
# want to configure a static port for. This could conceivably be
# passed into the script as a parameter.
[reflection.assembly]::LoadWithPartialName("Microsoft.SqlServer.Smo") | Out-Null
[reflection.assembly]::LoadWithPartialName("Microsoft.SqlServer.SqlWmiManagement") | Out-Null
$instanceName = 'SQL2008R2SP2'
$computerName = $env:COMPUTERNAME
$smo = 'Microsoft.SqlServer.Management.Smo.'
$wmi = New-Object ($smo + 'Wmi.ManagedComputer')
# For the named instance, on the current computer, for the TCP protocol,
# loop through all the IPs and configure them to use the standard port
# of 1433.
$uri = "ManagedComputer[@Name='$computerName']/ ServerInstance[@Name='$instanceName']/ServerProtocol[@Name='Tcp']"
$Tcp = $wmi.GetSmoObject($uri)
$Tcp.IsEnabled = $true
foreach ($ipAddress in $Tcp.IPAddresses)
{
$ipAddress.IPAddressProperties["TcpDynamicPorts"].Value = ""
$ipAddress.IPAddressProperties["TcpPort"].Value = "1433"
}
$Tcp.Alter()
# Enable named pipes
$uri = "ManagedComputer[@Name='$computerName']/ ServerInstance[@Name='$instanceName']/ServerProtocol[@Name='Np']"
$Np = $wmi.GetSmoObject($uri)
$Np.IsEnabled = $true
$pipeName = $Np.ProtocolProperties | Where Name -eq "PipeName"
$pipeName.Value = "\\.\pipe\sql\query"
$Np.Alter()
# Enable shared memory
$uri = "ManagedComputer[@Name='$computerName']/ ServerInstance[@Name='$instanceName']/ServerProtocol[@Name='Sm']"
$Sm = $wmi.GetSmoObject($uri)
$Sm.IsEnabled = $true
$Sm.Alter()
# Restart the named instance of SQL Server to enable the changes.
# Start services
Set-Service SQLBrowser -StartupType Manual
Start-Service SQLBrowser
Start-Service "MSSQL`$$instanceName"
nuget:
disable_publish_on_pr: true
build_script:
- build.cmd all /p:Configuration=Release
test: off
artifacts:
- path: target\Release\drop\msiext*.zip
name: zip
deploy: off
107 changes: 107 additions & 0 deletions externals/WinDDK/7600.16385.1/inc/atl71/afxstr.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,107 @@
// This is a part of the Microsoft Foundation Classes C++ library.
// Copyright (C) Microsoft Corporation
// All rights reserved.
//
// This source code is only intended as a supplement to the
// Microsoft Foundation Classes Reference and related
// electronic documentation provided with the library.
// See these sources for detailed information regarding the
// Microsoft Foundation Classes product.

/////////////////////////////////////////////////////////////////////////////
// AFXSTR.H - Framework-independent, templateable string class

#ifndef __AFXSTR_H__
#define __AFXSTR_H__

#pragma once

#ifndef _AFX
#error afxstr.h can only be used in MFC projects. Use atlstr.h
#endif

#include <mbstring.h>

HINSTANCE AFXAPI AfxGetResourceHandle();
HINSTANCE AFXAPI AfxFindStringResourceHandle(UINT nID);

UINT_PTR AFXAPI AfxReadStringLength(CArchive& ar, int& nCharSize);
void AFXAPI AfxWriteStringLength(CArchive& ar, UINT_PTR nLength, BOOL bUnicode);

#include <atlcore.h>
#include <cstringt.h>

ATL::IAtlStringMgr* AFXAPI AfxGetStringManager();

template< typename _CharType = char, class StringIterator = ATL::ChTraitsCRT< _CharType > >
class StrTraitMFC :
public StringIterator
{
public:
static HINSTANCE FindStringResourceInstance( UINT nID ) throw()
{
return( AfxFindStringResourceHandle( nID ) );
}

static ATL::IAtlStringMgr* GetDefaultManager() throw()
{
return( AfxGetStringManager() );
}
};

template< typename _CharType, class StringIterator>
class StrTraitMFC_DLL : public StringIterator
{
public:
static HINSTANCE FindStringResourceInstance( UINT nID ) throw()
{
return( AfxFindStringResourceHandle( nID ) );
}

static ATL::IAtlStringMgr* GetDefaultManager() throw()
{
return( AfxGetStringManager() );
}
};

// MFC-enabled compilation. Use MFC memory management and exceptions;
// also, use MFC module state.

// Don't import when MFC dll is being built
#if defined(_AFXDLL)

#if defined(_MFC_DLL_BLD)

template class ATL::CSimpleStringT< char, true >;
template class ATL::CStringT< char, StrTraitMFC_DLL< char > >;
template class ATL::CSimpleStringT< wchar_t, true >;
template class ATL::CStringT< wchar_t, StrTraitMFC_DLL< wchar_t > >;

#else

template class __declspec(dllimport) ATL::CSimpleStringT< char, true >;
template class __declspec(dllimport) ATL::CStringT< char, StrTraitMFC_DLL< char > >;
template class __declspec(dllimport) ATL::CSimpleStringT< wchar_t, true >;
template class __declspec(dllimport) ATL::CStringT< wchar_t, StrTraitMFC_DLL< wchar_t > >;
#if defined(_NATIVE_WCHAR_T)
template class __declspec(dllimport) ATL::CSimpleStringT< unsigned short, true >;
template class __declspec(dllimport) ATL::CStringT< unsigned short, StrTraitMFC_DLL< unsigned short > >;
#endif // _NATIVE_WCHAR_T

#endif // _MFC_DLL_BLD

typedef ATL::CStringT< wchar_t, StrTraitMFC_DLL< wchar_t > > CStringW;
typedef ATL::CStringT< char, StrTraitMFC_DLL< char > > CStringA;
typedef ATL::CStringT< TCHAR, StrTraitMFC_DLL< TCHAR > > CString;

#else

typedef ATL::CStringT< wchar_t, StrTraitMFC< wchar_t > > CStringW;
typedef ATL::CStringT< char, StrTraitMFC< char > > CStringA;
typedef ATL::CStringT< TCHAR, StrTraitMFC< TCHAR > > CString;

#endif // !_WIN64 && _AFXDLL


#endif // __AFXSTR_H__ (whole file)

Loading

0 comments on commit d8898d0

Please sign in to comment.