@joebigelow / wix / commits / 533fb3c2

Modernize build system

Rob Mensching committed Mar 15, 2021 at 15:46 UTC 533fb3c24290f5c9684a661e2576d857fbee9fb6
12 files changed +138 -140
.gitignore
+32 -11
@@ -13,6 +13,9 @@
13 # User-specific files (MonoDevelop/Xamarin Studio)
14 *.userprefs
15
16 +# Mono auto generated files
17 +mono_crash.*
18 +
19 # Build results
20 [Dd]ebug/
21 [Dd]ebugPublic/
@@ -20,12 +23,14 @@
23 [Rr]eleases/
24 x64/
25 x86/
26 +[Ww][Ii][Nn]32/
27 [Aa][Rr][Mm]/
28 [Aa][Rr][Mm]64/
29 bld/
30 [Bb]in/
31 [Oo]bj/
32 [Ll]og/
33 +[Ll]ogs/
34
35 # Visual Studio 2015/2017 cache/options directory
36 .vs/
@@ -39,9 +44,10 @@ Generated\ Files/
44 [Tt]est[Rr]esult*/
45 [Bb]uild[Ll]og.*
46
42 -# NUNIT
47 +# NUnit
48 *.VisualState.xml
49 TestResult.xml
50 +nunit-*.xml
51
52 # Build Results of an ATL Project
53 [Dd]ebugPS/
@@ -56,6 +62,9 @@ project.lock.json
62 project.fragment.lock.json
63 artifacts/
64
65 +# ASP.NET Scaffolding
66 +ScaffoldingReadMe.txt
67 +
68 # StyleCop
69 StyleCopReport.xml
70
@@ -122,9 +131,6 @@ _ReSharper*/
131 *.[Rr]e[Ss]harper
132 *.DotSettings.user
133
125 -# JustCode is a .NET coding add-in
126 -.JustCode
127 -
134 # TeamCity is a build add-in
135 _TeamCity*
136
@@ -135,6 +141,11 @@ _TeamCity*
141 .axoCover/*
142 !.axoCover/settings.json
143
144 +# Coverlet is a free, cross platform Code Coverage Tool
145 +coverage*.json
146 +coverage*.xml
147 +coverage*.info
148 +
149 # Visual Studio code coverage results
150 *.coverage
151 *.coveragexml
@@ -182,6 +193,8 @@ PublishScripts/
193
194 # NuGet Packages
195 *.nupkg
196 +# NuGet Symbol Packages
197 +*.snupkg
198 # The packages folder can be ignored because of Package Restore
199 **/[Pp]ackages/*
200 # except build/, which is used as an MSBuild target.
@@ -206,6 +219,8 @@ BundleArtifacts/
219 Package.StoreAssociation.xml
220 _pkginfo.txt
221 *.appx
222 +*.appxbundle
223 +*.appxupload
224
225 # Visual Studio cache files
226 # files ending in .cache can be ignored
@@ -231,8 +246,6 @@ orleans.codegen.cs
246 # Since there are multiple workflows, uncomment next line to ignore bower_components
247 # (https://github.com/github/gitignore/pull/1529#issuecomment-104372622)
248 #bower_components/
234 -# ASP.NET Core default setup: bower directory is configured as wwwroot/lib/ and bower restore is true
235 -**/wwwroot/lib/
249
250 # RIA/Silverlight projects
251 Generated_Code/
@@ -257,6 +270,9 @@ ServiceFabricBackup/
270 *.bim.layout
271 *.bim_*.settings
272 *.rptproj.rsuser
273 +*- [Bb]ackup.rdl
274 +*- [Bb]ackup ([0-9]).rdl
275 +*- [Bb]ackup ([0-9][0-9]).rdl
276
277 # Microsoft Fakes
278 FakesAssemblies/
@@ -292,10 +308,6 @@ paket-files/
308 # FAKE - F# Make
309 .fake/
310
295 -# JetBrains Rider
296 -.idea/
297 -*.sln.iml
298 -
311 # CodeRush personal settings
312 .cr/personal
313
@@ -337,5 +349,14 @@ ASALocalRun/
349 # Local History for Visual Studio
350 .localhistory/
351
340 -# BeatPulse healthcheck temp database
352 +# BeatPulse healthcheck temp database
353 healthchecksdb
354 +
355 +# Backup folder for Package Reference Convert tool in Visual Studio 2017
356 +MigrationBackup/
357 +
358 +# Ionide (cross platform F# VS Code tools) working folder
359 +.ionide/
360 +
361 +# Fody - auto-generated XML schema
362 +FodyWeavers.xsd
appveyor.cmd
+9 -3
@@ -1,13 +1,19 @@
1 @setlocal
2 @pushd %~dp0
3 @set _C=Release
4 +@if /i "%1"=="debug" set _C=Debug
5
5 -nuget restore || exit /b
6 +:: Restore
7 +msbuild -p:Configuration=%_C% -t:Restore || exit /b
8
9 +:: Build
10 msbuild -p:Configuration=%_C% src\test\WixToolsetTest.Core.Native\WixToolsetTest.Core.Native.csproj || exit /b
11 +
12 +:: Test
13 dotnet test -c %_C% --no-build src\test\WixToolsetTest.Core.Native\WixToolsetTest.Core.Native.csproj || exit /b
14
10 -msbuild -t:Pack -p:Configuration=%_C% src\WixToolset.Core.Native\WixToolset.Core.Native.csproj || exit /b
15 +:: Pack
16 +msbuild -p:Configuration=%_C% -p:NoBuild=true -t:Pack src\WixToolset.Core.Native\WixToolset.Core.Native.csproj || exit /b
17
18 @popd
13 -@endlocal
\ No newline at end of file
19 +@endlocal
appveyor.yml
+4 -2
@@ -21,8 +21,6 @@ environment:
21 build_script:
22 - appveyor.cmd
23
24 -test: off
25 -
24 pull_requests:
25 do_not_increment_build_number: true
26
@@ -32,9 +30,13 @@ nuget:
30 skip_branch_with_pr: true
31 skip_tags: true
32
33 +test: off
34 +
35 artifacts:
36 - path: build\Release\**\*.nupkg
37 name: nuget
38 +- path: build\Release\**\*.snupkg
39 + name: snupkg
40
41 notifications:
42 - provider: Slack
src/Directory.Build.props
+1 -3
@@ -22,8 +22,6 @@
22 <Product>WiX Toolset</Product>
23 </PropertyGroup>
24
25 - <Import Project="CSharp.Build.props" Condition=" '$(MSBuildProjectExtension)'=='.csproj' and Exists('CSharp.Build.props') " />
26 - <Import Project="Cpp.Build.props" Condition=" Exists('Cpp.Build.props') And '$(MSBuildProjectExtension)'=='.vcxproj' " />
27 - <Import Project="Wix.Build.props" Condition=" Exists('Wix.Build.props') And '$(MSBuildProjectExtension)'=='.wixproj' " />
25 + <Import Project="Directory$(MSBuildProjectExtension).props" Condition=" Exists('Directory$(MSBuildProjectExtension).props') " />
26 <Import Project="Custom.Build.props" Condition=" Exists('Custom.Build.props') " />
27 </Project>
src/Directory.Build.targets
+2 -7
@@ -9,11 +9,6 @@
9 See the original here: https://github.com/dotnet/sdk/issues/1151#issuecomment-385133284
10 -->
11 <Project>
12 - <PropertyGroup>
13 - <CreateDocumentation Condition=" '$(CreateDocumentationFile)'!='true' ">false</CreateDocumentation>
14 - <DocumentationFile Condition=" '$(CreateDocumentationFile)'=='true' ">$(OutputPath)\$(AssemblyName).xml</DocumentationFile>
15 - </PropertyGroup>
16 -
12 <PropertyGroup>
13 <ReplacePackageReferences>true</ReplacePackageReferences>
14 <TheSolutionPath Condition=" '$(NCrunch)'=='' ">$(SolutionPath)</TheSolutionPath>
@@ -45,12 +40,12 @@
40 <ProjectReference Include="@(PackageInSolution->'$(SmartSolutionDir)\%(SmartPath)' )"/>
41
42 <!-- Remove the package references that are now referenced as projects -->
48 - <PackageReference Remove="@(PackageInSolution->'%(PackageName)' )"/>
43 + <PackageReference Remove="@(PackageInSolution->'%(PackageName)')"/>
44 </ItemGroup>
45
46 </When>
47 </Choose>
48
54 - <Import Project="Wix.Build.targets" Condition=" Exists('Wix.Build.targets') And '$(MSBuildProjectExtension)'=='.wixproj' " />
49 + <Import Project="Directory$(MSBuildProjectExtension).targets" Condition=" Exists('Directory$(MSBuildProjectExtension).targets') " />
50 <Import Project="Custom.Build.targets" Condition=" Exists('Custom.Build.targets') " />
51 </Project>
src/Directory.csproj.props renamed
src/Directory.csproj.targets new
+26
@@ -0,0 +1,26 @@
1 +<!-- 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. -->
2 +<!--
3 + Do NOT modify this file. Update the canonical version in Home\repo-template\src\Directory.csproj.targets
4 + then update all of the repos.
5 +-->
6 +<Project>
7 + <PropertyGroup>
8 + <CreateDocumentation Condition=" '$(CreateDocumentationFile)'!='true' ">false</CreateDocumentation>
9 + <DocumentationFile Condition=" '$(CreateDocumentationFile)'=='true' ">$(OutputPath)\$(AssemblyName).xml</DocumentationFile>
10 + </PropertyGroup>
11 +
12 + <Target Name="SetNuspecProperties" DependsOnTargets="InitializeSourceControlInformation" AfterTargets="GetBuildVersion"
13 + Condition=" Exists('$(MSBuildProjectName).nuspec') ">
14 + <PropertyGroup>
15 + <ProjectUrl Condition=" '$(ProjectUrl)'=='' and '$(PrivateRepositoryUrl)'!='' ">$(PrivateRepositoryUrl.Replace('.git',''))</ProjectUrl>
16 +
17 + <NuspecFile>$(MSBuildProjectName).nuspec</NuspecFile>
18 + <NuspecBasePath Condition=" '$(NuspecBasePath)'=='' ">$(OutputPath)..\</NuspecBasePath>
19 + <NuspecProperties>$(NuspecProperties);Id=$(PackageId);Authors=$(Authors);Copyright=$(Copyright);Description=$(Description);Title=$(Title)</NuspecProperties>
20 + <NuspecProperties>$(NuspecProperties);Version=$(PackageVersion);RepositoryCommit=$(SourceRevisionId);RepositoryType=$(RepositoryType);RepositoryUrl=$(PrivateRepositoryUrl);ProjectFolder=$(MSBuildProjectDirectory)\;ProjectUrl=$(ProjectUrl)</NuspecProperties>
21 + <PublishRepositoryUrl>true</PublishRepositoryUrl>
22 + <SymbolPackageFormat>snupkg</SymbolPackageFormat>
23 + </PropertyGroup>
24 + </Target>
25 +
26 +</Project>
src/Directory.vcxproj.props renamed
+25
@@ -6,6 +6,13 @@
6 <Platform Condition=" '$(Platform)' == '' OR '$(Platform)' == 'AnyCPU' ">Win32</Platform>
7 <IntDir>$(BaseIntermediateOutputPath)$(Configuration)\$(Platform)\</IntDir>
8 <OutDir>$(OutputPath)$(Platform)\</OutDir>
9 +
10 + <!-- NBGV properties -->
11 + <AssemblyCompany>$(Company)</AssemblyCompany>
12 + <AssemblyCopyright>$(Copyright)</AssemblyCopyright>
13 +
14 + <RuntimeIdentifiers>win-x86;win-x64;win-arm64</RuntimeIdentifiers>
15 + <NuGetTargetMoniker>native,Version=v0.0</NuGetTargetMoniker>
16 </PropertyGroup>
17
18 <PropertyGroup Condition="'$(WindowsTargetPlatformVersion)'=='' AND '$(VisualStudioVersion)'>='15.0'">
@@ -70,6 +77,12 @@
77 <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
78 </ClCompile>
79 </ItemDefinitionGroup>
80 + <ItemDefinitionGroup Condition=" '$(Configuration)'=='Debug' and '$(CLRSupport)'=='true' ">
81 + <ClCompile>
82 + <BasicRuntimeChecks></BasicRuntimeChecks>
83 + <RuntimeLibrary>MultiThreadedDebugDll</RuntimeLibrary>
84 + </ClCompile>
85 + </ItemDefinitionGroup>
86 <ItemDefinitionGroup Condition=" '$(Configuration)'=='Release' ">
87 <ClCompile>
88 <Optimization>MinSpace</Optimization>
@@ -83,4 +96,16 @@
96 <OptimizeReferences>true</OptimizeReferences>
97 </Link>
98 </ItemDefinitionGroup>
99 + <ItemDefinitionGroup Condition=" '$(Configuration)'=='Release' and '$(CLRSupport)'=='true' ">
100 + <ClCompile>
101 + <BasicRuntimeChecks></BasicRuntimeChecks>
102 + <RuntimeLibrary>MultiThreadedDll</RuntimeLibrary>
103 + </ClCompile>
104 + </ItemDefinitionGroup>
105 + <ItemDefinitionGroup Condition=" '$(CLRSupport)'=='true' ">
106 + <Link>
107 + <KeyFile>$(LinkKeyFile)</KeyFile>
108 + <DelaySign>$(LinkDelaySign)</DelaySign>
109 + </Link>
110 + </ItemDefinitionGroup>
111 </Project>
src/WixToolset.Core.Native/WixToolset.Core.Native.csproj
+18 -65
@@ -5,82 +5,35 @@
5
6 <PropertyGroup>
7 <TargetFramework>netstandard2.0</TargetFramework>
8 - <NuspecFile>$(MSBuildThisFileName).nuspec</NuspecFile>
9 - <Description>Core Native</Description>
8 <DebugType>embedded</DebugType>
9 + <Description>WiX Toolset Native Processing</Description>
10 <IncludeSymbols>true</IncludeSymbols>
11 <CreateDocumentationFile>true</CreateDocumentationFile>
12 </PropertyGroup>
13
15 - <ItemGroup>
16 - <ProjectReference Include="..\wixnative\wixnative.vcxproj">
17 - <PrivateAssets>All</PrivateAssets>
18 - <Properties>Platform=ARM64</Properties>
19 - </ProjectReference>
20 - <ProjectReference Include="..\wixnative\wixnative.vcxproj">
21 - <PrivateAssets>All</PrivateAssets>
22 - <Properties>Platform=Win32</Properties>
23 - </ProjectReference>
24 - <ProjectReference Include="..\wixnative\wixnative.vcxproj">
25 - <PrivateAssets>All</PrivateAssets>
26 - <Properties>Platform=x64</Properties>
27 - </ProjectReference>
14 + <ItemGroup Condition=" '$(NCrunch)'=='' ">
15 + <ProjectReference Include="..\wixnative\wixnative.vcxproj" ReferenceOutputAssembly="false" PrivateAssets="All" Properties="Platform=ARM64" />
16 + <ProjectReference Include="..\wixnative\wixnative.vcxproj" ReferenceOutputAssembly="false" PrivateAssets="All" Properties="Platform=Win32" />
17 + <ProjectReference Include="..\wixnative\wixnative.vcxproj" ReferenceOutputAssembly="false" PrivateAssets="All" Properties="Platform=x64" />
18 + </ItemGroup>
19 +
20 + <ItemGroup Condition=" '$(NCrunch)'=='' ">
21 + <None Include="$(BaseOutputPath)$(Configuration)\x64\mergemod.dll" CopyToOutputDirectory="PreserveNewest" />
22 + <None Include="$(BaseOutputPath)$(Configuration)\x64\wixnative.exe" CopyToOutputDirectory="PreserveNewest" />
23 + <None Include="$(BaseOutputPath)$(Configuration)\x64\wixnative.pdb" CopyToOutputDirectory="PreserveNewest" />
24 + </ItemGroup>
25 + <ItemGroup Condition=" '$(NCrunch)'=='1' ">
26 + <None Include="$(NCrunchOriginalProjectDir)..\..\build\$(Configuration)\x64\mergemod.dll" CopyToOutputDirectory="PreserveNewest" />
27 + <None Include="$(NCrunchOriginalProjectDir)..\..\build\$(Configuration)\x64\wixnative.exe" CopyToOutputDirectory="PreserveNewest" />
28 + <None Include="$(NCrunchOriginalProjectDir)..\..\build\$(Configuration)\x64\wixnative.pdb" CopyToOutputDirectory="PreserveNewest" />
29 </ItemGroup>
30
31 <ItemGroup>
31 - <PackageReference Include="WixToolset.Data" Version="4.0.*" PrivateAssets="All" />
32 + <PackageReference Include="WixToolset.Data" Version="4.0.*" PrivateAssets="all" />
33 </ItemGroup>
34
35 <ItemGroup>
35 - <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
36 + <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="all" />
37 <PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" PrivateAssets="all" />
38 </ItemGroup>
38 -
39 - <PropertyGroup>
40 - <NativeFileListPath Condition=" '$(NCrunch)'=='' ">$(MSBuildProjectDir)..\..\build\obj\$(ProjectName)\$(Configuration)\NativeFileList.txt</NativeFileListPath>
41 - <NativeFileListPath Condition=" '$(NCrunch)'=='1' ">$(NCrunchOriginalProjectDir)..\..\build\obj\$(ProjectName)\$(Configuration)\NativeFileList.txt</NativeFileListPath>
42 - <MergeModDirectory>$(MSBuildThisFileDirectory)..\wixnative\</MergeModDirectory>
43 - </PropertyGroup>
44 -
45 - <Target Name="BuildWixNative" BeforeTargets="GetCopyToOutputDirectoryItems" Condition=" '$(NCrunch)'=='' ">
46 - <ItemGroup>
47 - <_NativeProjectOutput Include="$(MergeModDirectory)x64\mergemod.dll" />
48 - <_NativeProjectOutput Include="$(OutputPath)..\x64\wixnative.exe" />
49 - <_NativeProjectOutput Include="$(OutputPath)..\x64\wixnative.pdb" />
50 - </ItemGroup>
51 -
52 - <WriteLinesToFile File="$(NativeFileListPath)" Lines="@(_NativeProjectOutput)" Overwrite="true" />
53 -
54 - <ItemGroup>
55 - <FileWrites Include="$(NativeFileListPath)" />
56 -
57 - <AllItemsFullPathWithTargetPath Include="@(_NativeProjectOutput->'%(FullPath)')">
58 - <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
59 - <TargetPath>%(Filename)%(Extension)</TargetPath>
60 - </AllItemsFullPathWithTargetPath>
61 - </ItemGroup>
62 - </Target>
63 -
64 - <Target Name="NCrunchCopyNative" AfterTargets="AfterBuild" Condition=" '$(NCrunch)'=='1' ">
65 - <ReadLinesFromFile File="$(NativeFileListPath)">
66 - <Output TaskParameter="Lines" ItemName="_NCrunchNativeProjectOutput" />
67 - </ReadLinesFromFile>
68 -
69 - <Error Text="You must build $(MSBuildProjectName) to create the referenced native projects. Once built, 'Reload and rebuild' the project in the NCrunch Tests. The $(NativeFileListPath) file must not be empty." Condition=" '@(_NCrunchNativeProjectOutput)'=='' " />
70 -
71 - <Copy SourceFiles="@(_NCrunchNativeProjectOutput)" DestinationFolder="$(OutputPath)" SkipUnchangedFiles="true">
72 - <Output TaskParameter="CopiedFiles" ItemName="_NCrunchNativeCopied" />
73 - </Copy>
74 -
75 - <ItemGroup>
76 - <FileWrites Include="@(_NCrunchNativeCopied)" />
77 - </ItemGroup>
78 - </Target>
79 -
80 - <Target Name="SetNuspecProperties" AfterTargets="CoreBuild">
81 - <PropertyGroup>
82 - <NuspecBasePath>$(OutputPath)..\</NuspecBasePath>
83 - <NuspecProperties>Id=$(MSBuildThisFileName);Version=$(BuildVersionSimple);Authors=$(Authors);Copyright=$(Copyright);Description=$(Description);RepositoryCommit=$(SourceRevisionId);RepositoryType=$(RepositoryType);RepositoryUrl=$(PrivateRepositoryUrl);MergeModDir=$(MergeModDirectory)</NuspecProperties>
84 - </PropertyGroup>
85 - </Target>
39 </Project>
src/WixToolset.Core.Native/WixToolset.Core.Native.nuspec
+7 -7
@@ -3,16 +3,16 @@
3 <metadata minClientVersion="4.0">
4 <id>$id$</id>
5 <version>$version$</version>
6 + <title>$title$</title>
7 + <description>$description$</description>
8 <authors>$authors$</authors>
7 - <owners>$authors$</owners>
9 <license type="expression">MS-RL</license>
9 - <projectUrl>https://github.com/wixtoolset/Core.Native</projectUrl>
10 <requireLicenseAcceptance>false</requireLicenseAcceptance>
11 - <description>$description$</description>
11 <copyright>$copyright$</copyright>
12 + <projectUrl>$projectUrl$</projectUrl>
13 <repository type="$repositorytype$" url="$repositoryurl$" commit="$repositorycommit$" />
14 <dependencies>
15 - <group targetFramework=".NETStandard2.0" />
15 + <group targetFramework="netstandard2.0" />
16 </dependencies>
17 </metadata>
18
@@ -20,13 +20,13 @@
20 <file src="netstandard2.0\$id$.dll" target="lib\netstandard2.0" />
21 <file src="netstandard2.0\$id$.xml" target="lib\netstandard2.0" />
22
23 - <file src="$mergemoddir$ARM64\mergemod.dll" target="runtimes\win-arm64\native" />
23 + <file src="ARM64\mergemod.dll" target="runtimes\win-arm64\native" />
24 <file src="ARM64\wixnative.exe" target="runtimes\win-arm64\native" />
25 <file src="ARM64\wixnative.pdb" target="runtimes\win-arm64\native" />
26 - <file src="$mergemoddir$Win32\mergemod.dll" target="runtimes\win-x86\native" />
26 + <file src="Win32\mergemod.dll" target="runtimes\win-x86\native" />
27 <file src="Win32\wixnative.exe" target="runtimes\win-x86\native" />
28 <file src="Win32\wixnative.pdb" target="runtimes\win-x86\native" />
29 - <file src="$mergemoddir$x64\mergemod.dll" target="runtimes\win-x64\native" />
29 + <file src="x64\mergemod.dll" target="runtimes\win-x64\native" />
30 <file src="x64\wixnative.exe" target="runtimes\win-x64\native" />
31 <file src="x64\wixnative.pdb" target="runtimes\win-x64\native" />
32 </files>
src/test/WixToolsetTest.Core.Native/WixToolsetTest.Core.Native.csproj
+1 -6
@@ -9,18 +9,13 @@
9 </PropertyGroup>
10
11 <ItemGroup>
12 - <Content Include="TestData\test.cab" CopyToOutputDirectory="PreserveNewest" />
13 - <Content Include="TestData\test.txt" CopyToOutputDirectory="PreserveNewest" />
12 + <Content Include="TestData\**" CopyToOutputDirectory="PreserveNewest" />
13 </ItemGroup>
14
15 <ItemGroup>
16 <ProjectReference Include="..\..\WixToolset.Core.Native\WixToolset.Core.Native.csproj" />
17 </ItemGroup>
18
20 - <ItemGroup>
21 - <PackageReference Include="WixToolset.Data" Version="4.0.*" PrivateAssets="All" />
22 - </ItemGroup>
23 -
19 <ItemGroup>
20 <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.3.0" />
21 <PackageReference Include="xunit" Version="2.4.1" />
src/wixnative/wixnative.vcxproj
+13 -36
@@ -2,11 +2,6 @@
2 <!-- 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. -->
3
4 <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
5 - <Import Project="..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.props" Condition="Exists('..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.props')" />
6 - <Import Project="..\..\packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.props" Condition="Exists('..\..\packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.props')" />
7 - <Import Project="..\..\packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.props" Condition="Exists('..\..\packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.props')" />
8 - <Import Project="..\..\packages\WixToolset.DUtil.4.0.56\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.56\build\WixToolset.DUtil.props')" />
9 -
5 <ItemGroup Label="ProjectConfigurations">
6 <ProjectConfiguration Include="Debug|ARM64">
7 <Configuration>Debug</Configuration>
@@ -37,34 +32,23 @@
32 <PropertyGroup Label="Globals">
33 <ProjectGuid>{8497EC72-B8D0-4272-A9D0-7E9D871CEFBF}</ProjectGuid>
34 <ConfigurationType>Application</ConfigurationType>
40 - <ProjectSubSystem>Console</ProjectSubSystem>
41 - <TargetName>wixnative</TargetName>
35 <PlatformToolset>v142</PlatformToolset>
36 <CharacterSet>Unicode</CharacterSet>
37 + <ProjectSubSystem>Console</ProjectSubSystem>
38 + <TargetName>wixnative</TargetName>
39 + <Description>WiX Native Processing</Description>
40 + <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
41 </PropertyGroup>
42
43 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
44 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
45
49 - <ImportGroup Label="ExtensionSettings">
50 - </ImportGroup>
51 -
52 - <ImportGroup Label="Shared">
53 - <Import Project="..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets" Condition="Exists('..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets')" />
54 - <Import Project="..\..\packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.targets" Condition="Exists('..\..\packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.targets')" />
55 - <Import Project="..\..\packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.targets" Condition="Exists('..\..\packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.targets')" />
56 - <Import Project="..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.targets" Condition="Exists('..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.targets')" />
57 - </ImportGroup>
58 -
46 <PropertyGroup>
47 <ProjectAdditionalLinkLibraries>crypt32.lib;cabinet.lib;msi.lib</ProjectAdditionalLinkLibraries>
48 </PropertyGroup>
49
50 <ItemGroup>
64 - <ClCompile Include="wixnative.cpp">
65 - <!-- turn off deprecation warning -->
66 - <DisableSpecificWarnings>4996</DisableSpecificWarnings>
67 - </ClCompile>
51 + <ClCompile Include="wixnative.cpp" />
52 <ClCompile Include="precomp.cpp">
53 <PrecompiledHeader>Create</PrecompiledHeader>
54 </ClCompile>
@@ -79,21 +63,14 @@
63 </ItemGroup>
64
65 <ItemGroup>
82 - <None Include="packages.config" />
66 + <ContentWithTargetPath Include="$(Platform)\mergemod.dll" CopyToOutputDirectory="PreserveNewest" TargetPath="mergemod.dll" />
67 + </ItemGroup>
68 +
69 + <ItemGroup>
70 + <PackageReference Include="WixToolset.Dutil" Version="4.0.64" />
71 + <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" />
72 + <PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" />
73 </ItemGroup>
74
75 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
86 - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
87 - <PropertyGroup>
88 - <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105.The missing file is {0}.</ErrorText>
89 - </PropertyGroup>
90 - <Error Condition="!Exists('..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets'))" />
91 - <Error Condition="!Exists('..\..\packages\WixToolset.DUtil.4.0.56\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.DUtil.4.0.56\build\WixToolset.DUtil.props'))" />
92 - <Error Condition="!Exists('..\..\packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.props'))" />
93 - <Error Condition="!Exists('..\..\packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.targets'))" />
94 - <Error Condition="!Exists('..\..\packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.props'))" />
95 - <Error Condition="!Exists('..\..\packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.targets'))" />
96 - <Error Condition="!Exists('..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.props'))" />
97 - <Error Condition="!Exists('..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.targets'))" />
98 - </Target>
99 -</Project>
\ No newline at end of file
76 +</Project>