This commit is contained in:
Rob Mensching 2021-04-07 23:44:12 -07:00
Родитель 85e8091e50
Коммит babe3697ec
15 изменённых файлов: 155 добавлений и 65 удалений

43
.gitignore поставляемый
Просмотреть файл

@ -13,6 +13,9 @@
# User-specific files (MonoDevelop/Xamarin Studio)
*.userprefs
# Mono auto generated files
mono_crash.*
# Build results
[Dd]ebug/
[Dd]ebugPublic/
@ -20,12 +23,14 @@
[Rr]eleases/
x64/
x86/
[Ww][Ii][Nn]32/
[Aa][Rr][Mm]/
[Aa][Rr][Mm]64/
bld/
[Bb]in/
[Oo]bj/
[Ll]og/
[Ll]ogs/
# Visual Studio 2015/2017 cache/options directory
.vs/
@ -39,9 +44,10 @@ Generated\ Files/
[Tt]est[Rr]esult*/
[Bb]uild[Ll]og.*
# NUNIT
# NUnit
*.VisualState.xml
TestResult.xml
nunit-*.xml
# Build Results of an ATL Project
[Dd]ebugPS/
@ -56,6 +62,9 @@ project.lock.json
project.fragment.lock.json
artifacts/
# ASP.NET Scaffolding
ScaffoldingReadMe.txt
# StyleCop
StyleCopReport.xml
@ -122,9 +131,6 @@ _ReSharper*/
*.[Rr]e[Ss]harper
*.DotSettings.user
# JustCode is a .NET coding add-in
.JustCode
# TeamCity is a build add-in
_TeamCity*
@ -135,6 +141,11 @@ _TeamCity*
.axoCover/*
!.axoCover/settings.json
# Coverlet is a free, cross platform Code Coverage Tool
coverage*.json
coverage*.xml
coverage*.info
# Visual Studio code coverage results
*.coverage
*.coveragexml
@ -182,6 +193,8 @@ PublishScripts/
# NuGet Packages
*.nupkg
# NuGet Symbol Packages
*.snupkg
# The packages folder can be ignored because of Package Restore
**/[Pp]ackages/*
# except build/, which is used as an MSBuild target.
@ -206,6 +219,8 @@ BundleArtifacts/
Package.StoreAssociation.xml
_pkginfo.txt
*.appx
*.appxbundle
*.appxupload
# Visual Studio cache files
# files ending in .cache can be ignored
@ -231,8 +246,6 @@ orleans.codegen.cs
# Since there are multiple workflows, uncomment next line to ignore bower_components
# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622)
#bower_components/
# ASP.NET Core default setup: bower directory is configured as wwwroot/lib/ and bower restore is true
**/wwwroot/lib/
# RIA/Silverlight projects
Generated_Code/
@ -257,6 +270,9 @@ ServiceFabricBackup/
*.bim.layout
*.bim_*.settings
*.rptproj.rsuser
*- [Bb]ackup.rdl
*- [Bb]ackup ([0-9]).rdl
*- [Bb]ackup ([0-9][0-9]).rdl
# Microsoft Fakes
FakesAssemblies/
@ -292,10 +308,6 @@ paket-files/
# FAKE - F# Make
.fake/
# JetBrains Rider
.idea/
*.sln.iml
# CodeRush personal settings
.cr/personal
@ -337,5 +349,14 @@ ASALocalRun/
# Local History for Visual Studio
.localhistory/
# BeatPulse healthcheck temp database
# BeatPulse healthcheck temp database
healthchecksdb
# Backup folder for Package Reference Convert tool in Visual Studio 2017
MigrationBackup/
# Ionide (cross platform F# VS Code tools) working folder
.ionide/
# Fody - auto-generated XML schema
FodyWeavers.xsd

Просмотреть файл

@ -1,14 +1,19 @@
@setlocal
@pushd %~dp0
@set _C=Release
@if /i "%1"=="debug" set _C=Debug
nuget restore || exit /b
:: Restore
msbuild -p:Configuration=%_C% -t:Restore || exit /b
msbuild -p:Configuration=Release -t:Restore || exit /b
:: Build
msbuild -p:Configuration=%_C% src\test\WixToolsetTest.Sql\WixToolsetTest.Sql.csproj || exit /b
msbuild -p:Configuration=Release src\test\WixToolsetTest.Sql\WixToolsetTest.Sql.csproj || exit /b
dotnet test -c Release --no-build src\test\WixToolsetTest.Sql || exit /b
:: Test
dotnet test -c %_C% --no-build src\test\WixToolsetTest.Sql || exit /b
msbuild -p:Configuration=Release -t:Pack src\wixext\WixToolset.Sql.wixext.csproj || exit /b
:: Pack
msbuild -p:Configuration=%_C% -p:NoBuild=true -t:Pack src\wixext\WixToolset.Sql.wixext.csproj || exit /b
@popd
@endlocal
@endlocal

Просмотреть файл

@ -1,5 +1,5 @@
{
"msbuild-sdks": {
"WixToolset.Sdk": "4.0.0-build-0190"
"WixToolset.Sdk": "4.0.0-build-0206"
}
}

Просмотреть файл

@ -22,8 +22,6 @@
<Product>WiX Toolset</Product>
</PropertyGroup>
<Import Project="CSharp.Build.props" Condition=" '$(MSBuildProjectExtension)'=='.csproj' and Exists('CSharp.Build.props') " />
<Import Project="Cpp.Build.props" Condition=" Exists('Cpp.Build.props') And '$(MSBuildProjectExtension)'=='.vcxproj' " />
<Import Project="Wix.Build.props" Condition=" Exists('Wix.Build.props') And '$(MSBuildProjectExtension)'=='.wixproj' " />
<Import Project="Directory$(MSBuildProjectExtension).props" Condition=" Exists('Directory$(MSBuildProjectExtension).props') " />
<Import Project="Custom.Build.props" Condition=" Exists('Custom.Build.props') " />
</Project>

Просмотреть файл

@ -40,9 +40,12 @@
<ProjectReference Include="@(PackageInSolution->'$(SmartSolutionDir)\%(SmartPath)' )"/>
<!-- Remove the package references that are now referenced as projects -->
<PackageReference Remove="@(PackageInSolution->'%(PackageName)' )"/>
<PackageReference Remove="@(PackageInSolution->'%(PackageName)')"/>
</ItemGroup>
</When>
</Choose>
<Import Project="Directory$(MSBuildProjectExtension).targets" Condition=" Exists('Directory$(MSBuildProjectExtension).targets') " />
<Import Project="Custom.Build.targets" Condition=" Exists('Custom.Build.targets') " />
</Project>

Просмотреть файл

@ -5,7 +5,9 @@
-->
<Project>
<PropertyGroup>
<CheckForOverflowUnderflow>true</CheckForOverflowUnderflow>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)wix.snk))</AssemblyOriginatorKeyFile>
<NBGV_EmitThisAssemblyClass>false</NBGV_EmitThisAssemblyClass>
</PropertyGroup>
</Project>

Просмотреть файл

@ -0,0 +1,26 @@
<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
<!--
Do NOT modify this file. Update the canonical version in Home\repo-template\src\Directory.csproj.targets
then update all of the repos.
-->
<Project>
<PropertyGroup>
<CreateDocumentation Condition=" '$(CreateDocumentationFile)'!='true' ">false</CreateDocumentation>
<DocumentationFile Condition=" '$(CreateDocumentationFile)'=='true' ">$(OutputPath)\$(AssemblyName).xml</DocumentationFile>
</PropertyGroup>
<Target Name="SetNuspecProperties" DependsOnTargets="InitializeSourceControlInformation" AfterTargets="GetBuildVersion"
Condition=" Exists('$(MSBuildProjectName).nuspec') ">
<PropertyGroup>
<ProjectUrl Condition=" '$(ProjectUrl)'=='' and '$(PrivateRepositoryUrl)'!='' ">$(PrivateRepositoryUrl.Replace('.git',''))</ProjectUrl>
<NuspecFile>$(MSBuildProjectName).nuspec</NuspecFile>
<NuspecBasePath Condition=" '$(NuspecBasePath)'=='' ">$(OutputPath)..\</NuspecBasePath>
<NuspecProperties>$(NuspecProperties);Id=$(PackageId);Authors=$(Authors);Copyright=$(Copyright);Description=$(Description);Title=$(Title)</NuspecProperties>
<NuspecProperties>$(NuspecProperties);Version=$(PackageVersion);RepositoryCommit=$(SourceRevisionId);RepositoryType=$(RepositoryType);RepositoryUrl=$(PrivateRepositoryUrl);ProjectFolder=$(MSBuildProjectDirectory)\;ProjectUrl=$(ProjectUrl)</NuspecProperties>
<PublishRepositoryUrl>true</PublishRepositoryUrl>
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
</PropertyGroup>
</Target>
</Project>

Просмотреть файл

@ -6,6 +6,13 @@
<Platform Condition=" '$(Platform)' == '' OR '$(Platform)' == 'AnyCPU' ">Win32</Platform>
<IntDir>$(BaseIntermediateOutputPath)$(Configuration)\$(Platform)\</IntDir>
<OutDir>$(OutputPath)$(Platform)\</OutDir>
<!-- NBGV properties -->
<AssemblyCompany>$(Company)</AssemblyCompany>
<AssemblyCopyright>$(Copyright)</AssemblyCopyright>
<RuntimeIdentifiers>win-x86;win-x64;win-arm64</RuntimeIdentifiers>
<NuGetTargetMoniker>native,Version=v0.0</NuGetTargetMoniker>
</PropertyGroup>
<PropertyGroup Condition="'$(WindowsTargetPlatformVersion)'=='' AND '$(VisualStudioVersion)'>='15.0'">
@ -70,6 +77,12 @@
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
</ClCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition=" '$(Configuration)'=='Debug' and '$(CLRSupport)'=='true' ">
<ClCompile>
<BasicRuntimeChecks></BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDll</RuntimeLibrary>
</ClCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition=" '$(Configuration)'=='Release' ">
<ClCompile>
<Optimization>MinSpace</Optimization>
@ -83,4 +96,16 @@
<OptimizeReferences>true</OptimizeReferences>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition=" '$(Configuration)'=='Release' and '$(CLRSupport)'=='true' ">
<ClCompile>
<BasicRuntimeChecks></BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDll</RuntimeLibrary>
</ClCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition=" '$(CLRSupport)'=='true' ">
<Link>
<KeyFile>$(LinkKeyFile)</KeyFile>
<DelaySign>$(LinkDelaySign)</DelaySign>
</Link>
</ItemDefinitionGroup>
</Project>

Просмотреть файл

@ -1,5 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="WixToolset.DUtil" version="4.0.30" targetFramework="native" />
<package id="WixToolset.WcaUtil" version="4.0.16" targetFramework="native" />
</packages>

Просмотреть файл

@ -1,10 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\..\packages\WixToolset.DUtil.4.0.30\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.30\build\WixToolset.DUtil.props')" />
<Import Project="..\..\packages\WixToolset.WcaUtil.4.0.16\build\WixToolset.WcaUtil.props" Condition="Exists('..\..\packages\WixToolset.WcaUtil.4.0.16\build\WixToolset.WcaUtil.props')" />
<Project DefaultTargets="Build" ToolsVersion="16.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
@ -72,17 +69,15 @@
</ItemGroup>
<ItemGroup>
<None Include="packages.config" />
<None Include="sqlca.def" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ItemGroup>
<PackageReference Include="WixToolset.Dutil" Version="4.0.65" />
<PackageReference Include="WixToolset.WcaUtil" Version="4.0.18" />
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" />
<PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" />
</ItemGroup>
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('..\..\packages\WixToolset.DUtil.4.0.30\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.DUtil.4.0.30\build\WixToolset.DUtil.props'))" />
<Error Condition="!Exists('..\..\packages\WixToolset.WcaUtil.4.0.16\build\WixToolset.WcaUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.WcaUtil.4.0.16\build\WixToolset.WcaUtil.props'))" />
</Target>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
</Project>

Просмотреть файл

@ -12,10 +12,8 @@
</Package>
<Fragment>
<Directory Id="TARGETDIR" Name="SourceDir">
<Directory Id="ProgramFilesFolder">
<Directory Id="INSTALLFOLDER" Name="MsiPackage" />
</Directory>
</Directory>
<StandardDirectory Id="ProgramFilesFolder">
<Directory Id="INSTALLFOLDER" Name="MsiPackage" />
</StandardDirectory>
</Fragment>
</Wix>

Просмотреть файл

@ -12,10 +12,7 @@
</PropertyGroup>
<ItemGroup>
<Content Include="TestData\UsingSql\example.txt" CopyToOutputDirectory="PreserveNewest" />
<Content Include="TestData\UsingSql\Package.en-us.wxl" CopyToOutputDirectory="PreserveNewest" />
<Content Include="TestData\UsingSql\Package.wxs" CopyToOutputDirectory="PreserveNewest" />
<Content Include="TestData\UsingSql\PackageComponents.wxs" CopyToOutputDirectory="PreserveNewest" />
<Content Include="TestData\**" CopyToOutputDirectory="PreserveNewest" />
</ItemGroup>
<ItemGroup>

Просмотреть файл

@ -7,24 +7,24 @@
<RootNamespace>WixToolset.Sql</RootNamespace>
<Description>WiX Toolset Sql Extension</Description>
<Title>WiX Toolset Sql Extension</Title>
<IsTool>true</IsTool>
<ContentTargetFolders>build</ContentTargetFolders>
<DebugType>embedded</DebugType>
<IncludeSymbols>true</IncludeSymbols>
</PropertyGroup>
<ItemGroup>
<Content Include="$(MSBuildThisFileName).targets" />
<EmbeddedResource Include="$(OutputPath)..\sql.wixlib" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="WixToolset.Extensibility" Version="4.0.*" PrivateAssets="all" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\wixlib\sql.wixproj" ReferenceOutputAssembly="false" Condition=" '$(NCrunch)'=='' " />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Nerdbank.GitVersioning" Version="2.1.65" PrivateAssets="all" />
<PackageReference Include="WixToolset.Extensibility" Version="4.0.*" PrivateAssets="All" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
<PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" PrivateAssets="All" />
</ItemGroup>
</Project>

Просмотреть файл

@ -0,0 +1,25 @@
<?xml version="1.0"?>
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
<metadata minClientVersion="4.0">
<id>$id$</id>
<version>$version$</version>
<title>$title$</title>
<description>$description$</description>
<authors>$authors$</authors>
<license type="expression">MS-RL</license>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<copyright>$copyright$</copyright>
<projectUrl>$projectUrl$</projectUrl>
<repository type="$repositorytype$" url="$repositoryurl$" commit="$repositorycommit$" />
</metadata>
<files>
<file src="$projectFolder$$id$.targets" target="build" />
<file src="netstandard2.0\$id$.dll" target="tools" />
<file src="ARM64\*.pdb" target="pdbs\ARM64" />
<file src="x86\*.pdb" target="pdbs\x86" />
<file src="x64\*.pdb" target="pdbs\x64" />
</files>
</package>

Просмотреть файл

@ -1,11 +1,11 @@
<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
<Project Sdk="WixToolset.Sdk">
<PropertyGroup>
<OutputType>Library</OutputType>
<BindFiles>true</BindFiles>
<Cultures>en-us</Cultures>
</PropertyGroup>
<ItemGroup>
<BindInputPaths Include="$(OutputPath)x86" BindName='x86' />
<BindInputPaths Include="$(OutputPath)x64" BindName='x64' />
@ -13,12 +13,12 @@
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\ca\sqlca.vcxproj" Properties="Platform=ARM64" />
<ProjectReference Include="..\ca\sqlca.vcxproj" Properties="Platform=x86" />
<ProjectReference Include="..\ca\sqlca.vcxproj" Properties="Platform=x64" />
<ProjectReference Include="..\ca\sqlca.vcxproj" Properties="Platform=ARM64" ReferenceOutputAssembly="false" />
<ProjectReference Include="..\ca\sqlca.vcxproj" Properties="Platform=x86" ReferenceOutputAssembly="false" />
<ProjectReference Include="..\ca\sqlca.vcxproj" Properties="Platform=x64" ReferenceOutputAssembly="false" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Nerdbank.GitVersioning" Version="2.1.65" PrivateAssets="All" />
<PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" PrivateAssets="All" />
</ItemGroup>
</Project>
</Project>