@joebigelow / wix / commits / 45d84392

Update to latest build infrastructure

Rob Mensching committed Mar 1, 2021 at 12:36 UTC 45d84392eed8a1e6eae4f906ab382858ca23d740
13 files changed +243 -43
.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
+12 -7
@@ -1,17 +1,22 @@
1 @setlocal
2 @pushd %~dp0
3 +@set _C=Release
4 +@if /i "%1"=="debug" set _C=Debug
5
4 -nuget restore || exit /b
6 +:: Restore
7 +msbuild -p:Configuration=%_C% -t:Restore || exit /b
8
6 -msbuild -p:Configuration=Release -t:Restore || exit /b
9 +::msbuild -p:Configuration=%_C% -p:Platform=Win32 src\ca\complusca.vcxproj || exit /b
10 +::msbuild -p:Configuration=%_C% -p:Platform=x64 src\ca\complusca.vcxproj || exit /b
11
8 -msbuild -p:Configuration=Release -p:Platform=Win32 src\ca\complusca.vcxproj || exit /b
9 -msbuild -p:Configuration=Release -p:Platform=x64 src\ca\complusca.vcxproj || exit /b
12 +:: Build
13 +msbuild -p:Configuration=%_C% src\test\WixToolsetTest.ComPlus\WixToolsetTest.ComPlus.csproj || exit /b
14
11 -msbuild -p:Configuration=Release src\test\WixToolsetTest.ComPlus\WixToolsetTest.ComPlus.csproj || exit /b
12 -dotnet test -c Release --no-build src\test\WixToolsetTest.ComPlus || exit /b
15 +:: Test
16 +dotnet test -c %_C% --no-build src\test\WixToolsetTest.ComPlus || exit /b
17
14 -msbuild -p:Configuration=Release -t:Pack src\wixext\WixToolset.ComPlus.wixext.csproj || exit /b
18 +:: Pack
19 +msbuild -p:Configuration=%_C% -p:NoBuild=true -t:Pack src\wixext\WixToolset.ComPlus.wixext.csproj || exit /b
20
21 @popd
22 @endlocal
\ No newline at end of file
appveyor.yml
+2
@@ -33,6 +33,8 @@ skip_tags: true
33 artifacts:
34 - path: build\Release\**\*.nupkg
35 name: nuget
36 +- path: build\Release\**\*.snupkg
37 + name: snupkg
38
39 notifications:
40 - 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
+4 -1
@@ -40,9 +40,12 @@
40 <ProjectReference Include="@(PackageInSolution->'$(SmartSolutionDir)\%(SmartPath)' )"/>
41
42 <!-- Remove the package references that are now referenced as projects -->
43 - <PackageReference Remove="@(PackageInSolution->'%(PackageName)' )"/>
43 + <PackageReference Remove="@(PackageInSolution->'%(PackageName)')"/>
44 </ItemGroup>
45
46 </When>
47 </Choose>
48 +
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 new
+13
@@ -0,0 +1,13 @@
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\CSharp.Build.props
4 + then update all of the repos.
5 +-->
6 +<Project>
7 + <PropertyGroup>
8 + <CheckForOverflowUnderflow>true</CheckForOverflowUnderflow>
9 + <SignAssembly>true</SignAssembly>
10 + <AssemblyOriginatorKeyFile>$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)wix.snk))</AssemblyOriginatorKeyFile>
11 + <NBGV_EmitThisAssemblyClass>false</NBGV_EmitThisAssemblyClass>
12 + </PropertyGroup>
13 +</Project>
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 new
+93
@@ -0,0 +1,93 @@
1 +<?xml version="1.0" encoding="utf-8"?>
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>
5 + <PropertyGroup>
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'">
19 + <WindowsTargetPlatformVersion>$([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0'))</WindowsTargetPlatformVersion>
20 + </PropertyGroup>
21 +
22 + <ItemDefinitionGroup>
23 + <ClCompile>
24 + <DisableSpecificWarnings>$(DisableSpecificCompilerWarnings)</DisableSpecificWarnings>
25 + <WarningLevel>Level4</WarningLevel>
26 + <AdditionalIncludeDirectories>$(ProjectDir)inc;$(MSBuildProjectDirectory);$(IntDir);$(SqlCESdkIncludePath);$(ProjectAdditionalIncludeDirectories);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
27 + <PreprocessorDefinitions>WIN32;_WINDOWS;_WIN32_MSI=500;_WIN32_WINNT=0x0501;$(ArmPreprocessorDefinitions);$(UnicodePreprocessorDefinitions);_CRT_STDIO_LEGACY_WIDE_SPECIFIERS;_WINSOCK_DEPRECATED_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
28 + <PrecompiledHeader>Use</PrecompiledHeader>
29 + <PrecompiledHeaderFile>precomp.h</PrecompiledHeaderFile>
30 + <CallingConvention Condition="'$(Platform)'=='Win32'">StdCall</CallingConvention>
31 + <TreatWarningAsError>true</TreatWarningAsError>
32 + <ExceptionHandling>false</ExceptionHandling>
33 + <AdditionalOptions>-YlprecompDefine</AdditionalOptions>
34 + <AdditionalOptions Condition=" $(PlatformToolset.StartsWith('v14')) ">/Zc:threadSafeInit- %(AdditionalOptions)</AdditionalOptions>
35 + <MultiProcessorCompilation Condition=" $(NUMBER_OF_PROCESSORS) &gt; 4 ">true</MultiProcessorCompilation>
36 + </ClCompile>
37 + <ResourceCompile>
38 + <PreprocessorDefinitions>$(ArmPreprocessorDefinitions);%(PreprocessorDefinitions)</PreprocessorDefinitions>
39 + <AdditionalIncludeDirectories>$(ProjectAdditionalResourceIncludeDirectories);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
40 + </ResourceCompile>
41 + <Lib>
42 + <AdditionalLibraryDirectories>$(OutDir);$(AdditionalMultiTargetLibraryPath);$(ProjectAdditionalLibraryDirectories);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
43 + </Lib>
44 + <Link>
45 + <SubSystem>$(ProjectSubSystem)</SubSystem>
46 + <ModuleDefinitionFile>$(ProjectModuleDefinitionFile)</ModuleDefinitionFile>
47 + <NoEntryPoint>$(ResourceOnlyDll)</NoEntryPoint>
48 + <GenerateDebugInformation>true</GenerateDebugInformation>
49 + <AdditionalDependencies>$(ProjectAdditionalLinkLibraries);advapi32.lib;comdlg32.lib;user32.lib;oleaut32.lib;gdi32.lib;shell32.lib;ole32.lib;version.lib;%(AdditionalDependencies)</AdditionalDependencies>
50 + <AdditionalLibraryDirectories>$(OutDir);$(AdditionalMultiTargetLibraryPath);$(ArmLibraryDirectories);$(ProjectAdditionalLinkLibraryDirectories);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
51 + <AdditionalOptions Condition=" $(PlatformToolset.StartsWith('v14')) ">/IGNORE:4099 %(AdditionalOptions)</AdditionalOptions>
52 + </Link>
53 + </ItemDefinitionGroup>
54 +
55 + <ItemDefinitionGroup Condition=" '$(Platform)'=='Win32' and '$(PlatformToolset)'!='v100'">
56 + <ClCompile>
57 + <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet>
58 + </ClCompile>
59 + </ItemDefinitionGroup>
60 + <ItemDefinitionGroup Condition=" '$(Platform)'=='arm' ">
61 + <ClCompile>
62 + <CallingConvention>CDecl</CallingConvention>
63 + </ClCompile>
64 + </ItemDefinitionGroup>
65 + <ItemDefinitionGroup Condition=" '$(ConfigurationType)'=='StaticLibrary' ">
66 + <ClCompile>
67 + <DebugInformationFormat>OldStyle</DebugInformationFormat>
68 + <OmitDefaultLibName>true</OmitDefaultLibName>
69 + <IgnoreAllDefaultLibraries>true</IgnoreAllDefaultLibraries>
70 + </ClCompile>
71 + </ItemDefinitionGroup>
72 + <ItemDefinitionGroup Condition=" '$(Configuration)'=='Debug' ">
73 + <ClCompile>
74 + <Optimization>Disabled</Optimization>
75 + <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
76 + <PreprocessorDefinitions>_DEBUG;DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
77 + <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
78 + </ClCompile>
79 + </ItemDefinitionGroup>
80 + <ItemDefinitionGroup Condition=" '$(Configuration)'=='Release' ">
81 + <ClCompile>
82 + <Optimization>MinSpace</Optimization>
83 + <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
84 + <FunctionLevelLinking>true</FunctionLevelLinking>
85 + <IntrinsicFunctions>true</IntrinsicFunctions>
86 + <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
87 + </ClCompile>
88 + <Link>
89 + <EnableCOMDATFolding>true</EnableCOMDATFolding>
90 + <OptimizeReferences>true</OptimizeReferences>
91 + </Link>
92 + </ItemDefinitionGroup>
93 +</Project>
src/ca/complusca.vcxproj
+15 -10
@@ -1,8 +1,7 @@
1 <?xml version="1.0" encoding="utf-8"?>
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">
4 - <Import Project="..\..\packages\WixToolset.DUtil.4.0.30\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.30\build\WixToolset.DUtil.props')" />
5 - <Import Project="..\..\packages\WixToolset.WcaUtil.4.0.16\build\WixToolset.WcaUtil.props" Condition="Exists('..\..\packages\WixToolset.WcaUtil.4.0.16\build\WixToolset.WcaUtil.props')" />
5 <ItemGroup Label="ProjectConfigurations">
6 <ProjectConfiguration Include="Debug|Win32">
7 <Configuration>Debug</Configuration>
@@ -21,6 +20,7 @@
20 <Platform>x64</Platform>
21 </ProjectConfiguration>
22 </ItemGroup>
23 +
24 <PropertyGroup Label="Globals">
25 <ProjectGuid>{BDEF51ED-E242-4FA2-801A-01B127DF851A}</ProjectGuid>
26 <ConfigurationType>DynamicLibrary</ConfigurationType>
@@ -31,11 +31,14 @@
31 <Description>WiX Toolset ComPlus CustomAction</Description>
32 <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
33 </PropertyGroup>
34 +
35 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
36 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
37 +
38 <PropertyGroup>
39 <ProjectAdditionalLinkLibraries>msi.lib</ProjectAdditionalLinkLibraries>
40 </PropertyGroup>
41 +
42 <ItemGroup>
43 <ClCompile Include="cpappexec.cpp" />
44 <ClCompile Include="cpapproleexec.cpp" />
@@ -57,6 +60,7 @@
60 <PrecompiledHeader>Create</PrecompiledHeader>
61 </ClCompile>
62 </ItemGroup>
63 +
64 <ItemGroup>
65 <ClInclude Include="cpappexec.h" />
66 <ClInclude Include="cpapproleexec.h" />
@@ -75,16 +79,17 @@
79 <ClInclude Include="cputilsched.h" />
80 <ClInclude Include="precomp.h" />
81 </ItemGroup>
82 +
83 <ItemGroup>
79 - <None Include="packages.config" />
84 <None Include="complusca.def" />
85 </ItemGroup>
86 +
87 + <ItemGroup>
88 + <PackageReference Include="WixToolset.Dutil" Version="4.0.62" />
89 + <PackageReference Include="WixToolset.WcaUtil" Version="4.0.18" />
90 + <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" />
91 + <PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" />
92 + </ItemGroup>
93 +
94 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
83 - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
84 - <PropertyGroup>
85 - <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>
86 - </PropertyGroup>
87 - <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'))" />
88 - <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'))" />
89 - </Target>
95 </Project>
\ No newline at end of file
src/test/WixToolsetTest.ComPlus/WixToolsetTest.ComPlus.csproj
+1 -4
@@ -12,10 +12,7 @@
12 </PropertyGroup>
13
14 <ItemGroup>
15 - <Content Include="TestData\UsingComPlusPartition\example.txt" CopyToOutputDirectory="PreserveNewest" />
16 - <Content Include="TestData\UsingComPlusPartition\Package.en-us.wxl" CopyToOutputDirectory="PreserveNewest" />
17 - <Content Include="TestData\UsingComPlusPartition\Package.wxs" CopyToOutputDirectory="PreserveNewest" />
18 - <Content Include="TestData\UsingComPlusPartition\PackageComponents.wxs" CopyToOutputDirectory="PreserveNewest" />
15 + <Content Include="TestData\**" CopyToOutputDirectory="PreserveNewest" />
16 </ItemGroup>
17
18 <ItemGroup>
src/wixext/WixToolset.ComPlus.wixext.csproj
+7 -6
@@ -4,28 +4,29 @@
4 <Project Sdk="Microsoft.NET.Sdk">
5 <PropertyGroup>
6 <TargetFramework>netstandard2.0</TargetFramework>
7 + <DebugType>embedded</DebugType>
8 <RootNamespace>WixToolset.ComPlus</RootNamespace>
9 <Description>WiX Toolset ComPlus Extension</Description>
10 <Title>WiX Toolset ComPlus Extension</Title>
11 <IsTool>true</IsTool>
11 - <ContentTargetFolders>build</ContentTargetFolders>
12 + <IncludeSymbols>true</IncludeSymbols>
13 </PropertyGroup>
14
15 <ItemGroup>
15 - <Content Include="$(MSBuildThisFileName).targets" />
16 <EmbeddedResource Include="$(OutputPath)..\complus.wixlib" />
17 </ItemGroup>
18
19 <ItemGroup>
20 - <PackageReference Include="WixToolset.Data" Version="4.0.*" PrivateAssets="all" />
21 - <PackageReference Include="WixToolset.Extensibility" Version="4.0.*" PrivateAssets="all" />
20 + <ProjectReference Include="..\wixlib\complus.wixproj" ReferenceOutputAssembly="false" Condition=" '$(NCrunch)'=='' " />
21 </ItemGroup>
22
23 <ItemGroup>
25 - <ProjectReference Include="..\wixlib\complus.wixproj" ReferenceOutputAssembly="false" Condition=" '$(NCrunch)'=='' " />
24 + <PackageReference Include="WixToolset.Data" Version="4.0.*" PrivateAssets="all" />
25 + <PackageReference Include="WixToolset.Extensibility" Version="4.0.*" PrivateAssets="all" />
26 </ItemGroup>
27
28 <ItemGroup>
29 - <PackageReference Include="Nerdbank.GitVersioning" Version="2.1.65" PrivateAssets="all" />
29 + <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="all" />
30 + <PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" PrivateAssets="all" />
31 </ItemGroup>
32 </Project>
src/wixext/WixToolset.ComPlus.wixext.nuspec new
+24
@@ -0,0 +1,24 @@
1 +<?xml version="1.0"?>
2 +<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
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>
9 + <license type="expression">MS-RL</license>
10 + <requireLicenseAcceptance>false</requireLicenseAcceptance>
11 + <copyright>$copyright$</copyright>
12 + <projectUrl>$projectUrl$</projectUrl>
13 + <repository type="$repositorytype$" url="$repositoryurl$" commit="$repositorycommit$" />
14 + </metadata>
15 +
16 + <files>
17 + <file src="$projectFolder$$id$.targets" target="build" />
18 +
19 + <file src="netstandard2.0\$id$.dll" target="tools" />
20 +
21 + <file src="x86\*.pdb" target="pdbs\x86" />
22 + <file src="x64\*.pdb" target="pdbs\x64" />
23 + </files>
24 +</package>
src/wixlib/complus.wixproj
+13 -1
@@ -1,4 +1,6 @@
1 +<?xml version="1.0" encoding="utf-8"?>
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 Sdk="WixToolset.Sdk">
5
6 <PropertyGroup>
@@ -8,7 +10,17 @@
10 </PropertyGroup>
11
12 <ItemGroup>
11 - <PackageReference Include="Nerdbank.GitVersioning" Version="2.1.65" PrivateAssets="All" />
13 + <BindInputPaths Include="$(OutputPath)x86" BindName='x86' />
14 + <BindInputPaths Include="$(OutputPath)x64" BindName='x64' />
15 + </ItemGroup>
16 +
17 + <ItemGroup>
18 + <ProjectReference Include="..\ca\complusca.vcxproj" Properties="Platform=x86" ReferenceOutputAssembly="false" />
19 + <ProjectReference Include="..\ca\complusca.vcxproj" Properties="Platform=x64" ReferenceOutputAssembly="false" />
20 + </ItemGroup>
21 +
22 + <ItemGroup>
23 + <PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" PrivateAssets="All" />
24 </ItemGroup>
25
26 </Project>