aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.gitignore43
-rw-r--r--appveyor.cmd16
-rw-r--r--appveyor.yml2
-rw-r--r--global.json2
-rw-r--r--src/Directory.Build.props4
-rw-r--r--src/Directory.Build.targets9
-rw-r--r--src/Directory.csproj.props (renamed from src/CSharp.Build.props)0
-rw-r--r--src/Directory.csproj.targets26
-rw-r--r--src/Directory.vcxproj.props (renamed from src/Cpp.Build.props)21
-rw-r--r--src/ca/netfxca.vcxproj29
-rw-r--r--src/ca/packages.config5
-rw-r--r--src/test/WixToolsetTest.Netfx/WixToolsetTest.Netfx.csproj16
-rw-r--r--src/wixext/WixToolset.Netfx.wixext.csproj20
-rw-r--r--src/wixext/WixToolset.Netfx.wixext.nuspec7
-rw-r--r--src/wixlib/netfx.wixproj14
15 files changed, 132 insertions, 82 deletions
diff --git a/.gitignore b/.gitignore
index 3e8a1553..1ee53850 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,6 +13,9 @@
13# User-specific files (MonoDevelop/Xamarin Studio) 13# User-specific files (MonoDevelop/Xamarin Studio)
14*.userprefs 14*.userprefs
15 15
16# Mono auto generated files
17mono_crash.*
18
16# Build results 19# Build results
17[Dd]ebug/ 20[Dd]ebug/
18[Dd]ebugPublic/ 21[Dd]ebugPublic/
@@ -20,12 +23,14 @@
20[Rr]eleases/ 23[Rr]eleases/
21x64/ 24x64/
22x86/ 25x86/
26[Ww][Ii][Nn]32/
23[Aa][Rr][Mm]/ 27[Aa][Rr][Mm]/
24[Aa][Rr][Mm]64/ 28[Aa][Rr][Mm]64/
25bld/ 29bld/
26[Bb]in/ 30[Bb]in/
27[Oo]bj/ 31[Oo]bj/
28[Ll]og/ 32[Ll]og/
33[Ll]ogs/
29 34
30# Visual Studio 2015/2017 cache/options directory 35# Visual Studio 2015/2017 cache/options directory
31.vs/ 36.vs/
@@ -39,9 +44,10 @@ Generated\ Files/
39[Tt]est[Rr]esult*/ 44[Tt]est[Rr]esult*/
40[Bb]uild[Ll]og.* 45[Bb]uild[Ll]og.*
41 46
42# NUNIT 47# NUnit
43*.VisualState.xml 48*.VisualState.xml
44TestResult.xml 49TestResult.xml
50nunit-*.xml
45 51
46# Build Results of an ATL Project 52# Build Results of an ATL Project
47[Dd]ebugPS/ 53[Dd]ebugPS/
@@ -56,6 +62,9 @@ project.lock.json
56project.fragment.lock.json 62project.fragment.lock.json
57artifacts/ 63artifacts/
58 64
65# ASP.NET Scaffolding
66ScaffoldingReadMe.txt
67
59# StyleCop 68# StyleCop
60StyleCopReport.xml 69StyleCopReport.xml
61 70
@@ -122,9 +131,6 @@ _ReSharper*/
122*.[Rr]e[Ss]harper 131*.[Rr]e[Ss]harper
123*.DotSettings.user 132*.DotSettings.user
124 133
125# JustCode is a .NET coding add-in
126.JustCode
127
128# TeamCity is a build add-in 134# TeamCity is a build add-in
129_TeamCity* 135_TeamCity*
130 136
@@ -135,6 +141,11 @@ _TeamCity*
135.axoCover/* 141.axoCover/*
136!.axoCover/settings.json 142!.axoCover/settings.json
137 143
144# Coverlet is a free, cross platform Code Coverage Tool
145coverage*.json
146coverage*.xml
147coverage*.info
148
138# Visual Studio code coverage results 149# Visual Studio code coverage results
139*.coverage 150*.coverage
140*.coveragexml 151*.coveragexml
@@ -182,6 +193,8 @@ PublishScripts/
182 193
183# NuGet Packages 194# NuGet Packages
184*.nupkg 195*.nupkg
196# NuGet Symbol Packages
197*.snupkg
185# The packages folder can be ignored because of Package Restore 198# The packages folder can be ignored because of Package Restore
186**/[Pp]ackages/* 199**/[Pp]ackages/*
187# except build/, which is used as an MSBuild target. 200# except build/, which is used as an MSBuild target.
@@ -206,6 +219,8 @@ BundleArtifacts/
206Package.StoreAssociation.xml 219Package.StoreAssociation.xml
207_pkginfo.txt 220_pkginfo.txt
208*.appx 221*.appx
222*.appxbundle
223*.appxupload
209 224
210# Visual Studio cache files 225# Visual Studio cache files
211# files ending in .cache can be ignored 226# files ending in .cache can be ignored
@@ -231,8 +246,6 @@ orleans.codegen.cs
231# Since there are multiple workflows, uncomment next line to ignore bower_components 246# Since there are multiple workflows, uncomment next line to ignore bower_components
232# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622) 247# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622)
233#bower_components/ 248#bower_components/
234# ASP.NET Core default setup: bower directory is configured as wwwroot/lib/ and bower restore is true
235**/wwwroot/lib/
236 249
237# RIA/Silverlight projects 250# RIA/Silverlight projects
238Generated_Code/ 251Generated_Code/
@@ -257,6 +270,9 @@ ServiceFabricBackup/
257*.bim.layout 270*.bim.layout
258*.bim_*.settings 271*.bim_*.settings
259*.rptproj.rsuser 272*.rptproj.rsuser
273*- [Bb]ackup.rdl
274*- [Bb]ackup ([0-9]).rdl
275*- [Bb]ackup ([0-9][0-9]).rdl
260 276
261# Microsoft Fakes 277# Microsoft Fakes
262FakesAssemblies/ 278FakesAssemblies/
@@ -292,10 +308,6 @@ paket-files/
292# FAKE - F# Make 308# FAKE - F# Make
293.fake/ 309.fake/
294 310
295# JetBrains Rider
296.idea/
297*.sln.iml
298
299# CodeRush personal settings 311# CodeRush personal settings
300.cr/personal 312.cr/personal
301 313
@@ -337,5 +349,14 @@ ASALocalRun/
337# Local History for Visual Studio 349# Local History for Visual Studio
338.localhistory/ 350.localhistory/
339 351
340# BeatPulse healthcheck temp database 352# BeatPulse healthcheck temp database
341healthchecksdb 353healthchecksdb
354
355# Backup folder for Package Reference Convert tool in Visual Studio 2017
356MigrationBackup/
357
358# Ionide (cross platform F# VS Code tools) working folder
359.ionide/
360
361# Fody - auto-generated XML schema
362FodyWeavers.xsd
diff --git a/appveyor.cmd b/appveyor.cmd
index 2e91654b..d7e705f0 100644
--- a/appveyor.cmd
+++ b/appveyor.cmd
@@ -1,13 +1,19 @@
1@setlocal 1@setlocal
2@pushd %~dp0 2@pushd %~dp0
3@set _C=Release
4@if /i "%1"=="debug" set _C=Debug
3 5
4nuget restore || exit /b 6:: Restore
7msbuild -p:Configuration=%_C% -t:Restore || exit /b
5 8
6msbuild -p:Configuration=Release -Restore || exit /b 9:: Build
10msbuild -p:Configuration=%_C% src\test\WixToolsetTest.Netfx\WixToolsetTest.Netfx.csproj || exit /b
7 11
8dotnet test -c Release --no-build src\test\WixToolsetTest.Netfx || exit /b 12:: Test
13dotnet test -c %_C% --no-build src\test\WixToolsetTest.Netfx || exit /b
9 14
10msbuild -p:Configuration=Release -p:NoBuild=true -t:Pack src\wixext\WixToolset.NetFx.wixext.csproj || exit /b 15:: Pack
16msbuild -p:Configuration=%_C% -p:NoBuild=true -t:Pack src\wixext\WixToolset.Netfx.wixext.csproj || exit /b
11 17
12@popd 18@popd
13@endlocal \ No newline at end of file 19@endlocal
diff --git a/appveyor.yml b/appveyor.yml
index 7c686b04..c53cc9cc 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -33,6 +33,8 @@ skip_tags: true
33artifacts: 33artifacts:
34- path: build\Release\**\*.nupkg 34- path: build\Release\**\*.nupkg
35 name: nuget 35 name: nuget
36- path: build\Release\**\*.snupkg
37 name: snupkg
36 38
37notifications: 39notifications:
38- provider: Slack 40- provider: Slack
diff --git a/global.json b/global.json
index 3a97e4ba..30206a47 100644
--- a/global.json
+++ b/global.json
@@ -1,5 +1,5 @@
1{ 1{
2 "msbuild-sdks": { 2 "msbuild-sdks": {
3 "WixToolset.Sdk": "4.0.0-build-0193" 3 "WixToolset.Sdk": "4.0.0-build-0194"
4 } 4 }
5} 5}
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index f83cc154..b3c6287c 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -22,8 +22,6 @@
22 <Product>WiX Toolset</Product> 22 <Product>WiX Toolset</Product>
23 </PropertyGroup> 23 </PropertyGroup>
24 24
25 <Import Project="CSharp.Build.props" Condition=" '$(MSBuildProjectExtension)'=='.csproj' and Exists('CSharp.Build.props') " /> 25 <Import Project="Directory$(MSBuildProjectExtension).props" Condition=" Exists('Directory$(MSBuildProjectExtension).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' " />
28 <Import Project="Custom.Build.props" Condition=" Exists('Custom.Build.props') " /> 26 <Import Project="Custom.Build.props" Condition=" Exists('Custom.Build.props') " />
29</Project> 27</Project>
diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets
index cb988931..2fcc765a 100644
--- a/src/Directory.Build.targets
+++ b/src/Directory.Build.targets
@@ -10,11 +10,6 @@
10--> 10-->
11<Project> 11<Project>
12 <PropertyGroup> 12 <PropertyGroup>
13 <CreateDocumentation Condition=" '$(CreateDocumentationFile)'!='true' ">false</CreateDocumentation>
14 <DocumentationFile Condition=" '$(CreateDocumentationFile)'=='true' ">$(OutputPath)\$(AssemblyName).xml</DocumentationFile>
15 </PropertyGroup>
16
17 <PropertyGroup>
18 <ReplacePackageReferences>true</ReplacePackageReferences> 13 <ReplacePackageReferences>true</ReplacePackageReferences>
19 <TheSolutionPath Condition=" '$(NCrunch)'=='' ">$(SolutionPath)</TheSolutionPath> 14 <TheSolutionPath Condition=" '$(NCrunch)'=='' ">$(SolutionPath)</TheSolutionPath>
20 <TheSolutionPath Condition=" '$(NCrunch)'=='1' ">$(NCrunchOriginalSolutionPath)</TheSolutionPath> 15 <TheSolutionPath Condition=" '$(NCrunch)'=='1' ">$(NCrunchOriginalSolutionPath)</TheSolutionPath>
@@ -45,12 +40,12 @@
45 <ProjectReference Include="@(PackageInSolution->'$(SmartSolutionDir)\%(SmartPath)' )"/> 40 <ProjectReference Include="@(PackageInSolution->'$(SmartSolutionDir)\%(SmartPath)' )"/>
46 41
47 <!-- Remove the package references that are now referenced as projects --> 42 <!-- Remove the package references that are now referenced as projects -->
48 <PackageReference Remove="@(PackageInSolution->'%(PackageName)' )"/> 43 <PackageReference Remove="@(PackageInSolution->'%(PackageName)')"/>
49 </ItemGroup> 44 </ItemGroup>
50 45
51 </When> 46 </When>
52 </Choose> 47 </Choose>
53 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') " />
55 <Import Project="Custom.Build.targets" Condition=" Exists('Custom.Build.targets') " /> 50 <Import Project="Custom.Build.targets" Condition=" Exists('Custom.Build.targets') " />
56</Project> 51</Project>
diff --git a/src/CSharp.Build.props b/src/Directory.csproj.props
index 81d24ad1..81d24ad1 100644
--- a/src/CSharp.Build.props
+++ b/src/Directory.csproj.props
diff --git a/src/Directory.csproj.targets b/src/Directory.csproj.targets
new file mode 100644
index 00000000..c3270426
--- /dev/null
+++ b/src/Directory.csproj.targets
@@ -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>
diff --git a/src/Cpp.Build.props b/src/Directory.vcxproj.props
index e7bba117..47c2c143 100644
--- a/src/Cpp.Build.props
+++ b/src/Directory.vcxproj.props
@@ -10,6 +10,9 @@
10 <!-- NBGV properties --> 10 <!-- NBGV properties -->
11 <AssemblyCompany>$(Company)</AssemblyCompany> 11 <AssemblyCompany>$(Company)</AssemblyCompany>
12 <AssemblyCopyright>$(Copyright)</AssemblyCopyright> 12 <AssemblyCopyright>$(Copyright)</AssemblyCopyright>
13
14 <RuntimeIdentifiers>win-x86;win-x64;win-arm64</RuntimeIdentifiers>
15 <NuGetTargetMoniker>native,Version=v0.0</NuGetTargetMoniker>
13 </PropertyGroup> 16 </PropertyGroup>
14 17
15 <PropertyGroup Condition="'$(WindowsTargetPlatformVersion)'=='' AND '$(VisualStudioVersion)'>='15.0'"> 18 <PropertyGroup Condition="'$(WindowsTargetPlatformVersion)'=='' AND '$(VisualStudioVersion)'>='15.0'">
@@ -78,6 +81,12 @@
78 <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> 81 <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
79 </ClCompile> 82 </ClCompile>
80 </ItemDefinitionGroup> 83 </ItemDefinitionGroup>
84 <ItemDefinitionGroup Condition=" '$(Configuration)'=='Debug' and '$(CLRSupport)'=='true' ">
85 <ClCompile>
86 <BasicRuntimeChecks></BasicRuntimeChecks>
87 <RuntimeLibrary>MultiThreadedDebugDll</RuntimeLibrary>
88 </ClCompile>
89 </ItemDefinitionGroup>
81 <ItemDefinitionGroup Condition=" '$(Configuration)'=='Release' "> 90 <ItemDefinitionGroup Condition=" '$(Configuration)'=='Release' ">
82 <ClCompile> 91 <ClCompile>
83 <Optimization>MinSpace</Optimization> 92 <Optimization>MinSpace</Optimization>
@@ -91,4 +100,16 @@
91 <OptimizeReferences>true</OptimizeReferences> 100 <OptimizeReferences>true</OptimizeReferences>
92 </Link> 101 </Link>
93 </ItemDefinitionGroup> 102 </ItemDefinitionGroup>
103 <ItemDefinitionGroup Condition=" '$(Configuration)'=='Release' and '$(CLRSupport)'=='true' ">
104 <ClCompile>
105 <BasicRuntimeChecks></BasicRuntimeChecks>
106 <RuntimeLibrary>MultiThreadedDll</RuntimeLibrary>
107 </ClCompile>
108 </ItemDefinitionGroup>
109 <ItemDefinitionGroup Condition=" '$(CLRSupport)'=='true' ">
110 <Link>
111 <KeyFile>$(LinkKeyFile)</KeyFile>
112 <DelaySign>$(LinkDelaySign)</DelaySign>
113 </Link>
114 </ItemDefinitionGroup>
94</Project> 115</Project>
diff --git a/src/ca/netfxca.vcxproj b/src/ca/netfxca.vcxproj
index 2f91eba3..f01417b6 100644
--- a/src/ca/netfxca.vcxproj
+++ b/src/ca/netfxca.vcxproj
@@ -1,8 +1,7 @@
1<?xml version="1.0" encoding="utf-8"?> 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. --> 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<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> 3
4 <Import Project="..\..\packages\WixToolset.DUtil.4.0.64\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.64\build\WixToolset.DUtil.props')" /> 4<Project DefaultTargets="Build" ToolsVersion="16.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
5 <Import Project="..\..\packages\WixToolset.WcaUtil.4.0.18\build\WixToolset.WcaUtil.props" Condition="Exists('..\..\packages\WixToolset.WcaUtil.4.0.18\build\WixToolset.WcaUtil.props')" />
6 <ItemGroup Label="ProjectConfigurations"> 5 <ItemGroup Label="ProjectConfigurations">
7 <ProjectConfiguration Include="Debug|Win32"> 6 <ProjectConfiguration Include="Debug|Win32">
8 <Configuration>Debug</Configuration> 7 <Configuration>Debug</Configuration>
@@ -29,6 +28,7 @@
29 <Platform>ARM64</Platform> 28 <Platform>ARM64</Platform>
30 </ProjectConfiguration> 29 </ProjectConfiguration>
31 </ItemGroup> 30 </ItemGroup>
31
32 <PropertyGroup Label="Globals"> 32 <PropertyGroup Label="Globals">
33 <ProjectGuid>{F72D34CA-48DA-4DFD-91A9-A0C78BEF6981}</ProjectGuid> 33 <ProjectGuid>{F72D34CA-48DA-4DFD-91A9-A0C78BEF6981}</ProjectGuid>
34 <ConfigurationType>DynamicLibrary</ConfigurationType> 34 <ConfigurationType>DynamicLibrary</ConfigurationType>
@@ -38,31 +38,36 @@
38 <ProjectModuleDefinitionFile>netfxca.def</ProjectModuleDefinitionFile> 38 <ProjectModuleDefinitionFile>netfxca.def</ProjectModuleDefinitionFile>
39 <Description>WiX Toolset .NET Framework CustomAction</Description> 39 <Description>WiX Toolset .NET Framework CustomAction</Description>
40 </PropertyGroup> 40 </PropertyGroup>
41
41 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> 42 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
42 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> 43 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
44
43 <PropertyGroup> 45 <PropertyGroup>
44 <ProjectAdditionalLinkLibraries>msi.lib</ProjectAdditionalLinkLibraries> 46 <ProjectAdditionalLinkLibraries>msi.lib</ProjectAdditionalLinkLibraries>
45 </PropertyGroup> 47 </PropertyGroup>
48
46 <ItemGroup> 49 <ItemGroup>
47 <ClCompile Include="dllmain.cpp"> 50 <ClCompile Include="dllmain.cpp">
48 <PrecompiledHeader>Create</PrecompiledHeader> 51 <PrecompiledHeader>Create</PrecompiledHeader>
49 </ClCompile> 52 </ClCompile>
50 <ClCompile Include="netfxca.cpp" /> 53 <ClCompile Include="netfxca.cpp" />
51 </ItemGroup> 54 </ItemGroup>
55
52 <ItemGroup> 56 <ItemGroup>
53 <ClInclude Include="cost.h" /> 57 <ClInclude Include="cost.h" />
54 <ClInclude Include="precomp.h" /> 58 <ClInclude Include="precomp.h" />
55 </ItemGroup> 59 </ItemGroup>
60
56 <ItemGroup> 61 <ItemGroup>
57 <None Include="netfxca.def" /> 62 <None Include="netfxca.def" />
58 <None Include="packages.config" />
59 </ItemGroup> 63 </ItemGroup>
64
65 <ItemGroup>
66 <PackageReference Include="WixToolset.Dutil" Version="4.0.64" />
67 <PackageReference Include="WixToolset.WcaUtil" Version="4.0.18" />
68 <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" />
69 <PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" />
70 </ItemGroup>
71
60 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> 72 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
61 <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild"> 73</Project>
62 <PropertyGroup>
63 <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>
64 </PropertyGroup>
65 <Error Condition="!Exists('..\..\packages\WixToolset.DUtil.4.0.64\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.DUtil.4.0.64\build\WixToolset.DUtil.props'))" />
66 <Error Condition="!Exists('..\..\packages\WixToolset.WcaUtil.4.0.18\build\WixToolset.WcaUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.WcaUtil.4.0.18\build\WixToolset.WcaUtil.props'))" />
67 </Target>
68</Project> \ No newline at end of file
diff --git a/src/ca/packages.config b/src/ca/packages.config
deleted file mode 100644
index 8a6eee87..00000000
--- a/src/ca/packages.config
+++ /dev/null
@@ -1,5 +0,0 @@
1<?xml version="1.0" encoding="utf-8"?>
2<packages>
3 <package id="WixToolset.DUtil" version="4.0.64" targetFramework="native" />
4 <package id="WixToolset.WcaUtil" version="4.0.18" targetFramework="native" />
5</packages> \ No newline at end of file
diff --git a/src/test/WixToolsetTest.Netfx/WixToolsetTest.Netfx.csproj b/src/test/WixToolsetTest.Netfx/WixToolsetTest.Netfx.csproj
index acb9e4a4..1c41d176 100644
--- a/src/test/WixToolsetTest.Netfx/WixToolsetTest.Netfx.csproj
+++ b/src/test/WixToolsetTest.Netfx/WixToolsetTest.Netfx.csproj
@@ -4,22 +4,14 @@
4<Project Sdk="Microsoft.NET.Sdk"> 4<Project Sdk="Microsoft.NET.Sdk">
5 <PropertyGroup> 5 <PropertyGroup>
6 <TargetFramework>netcoreapp3.1</TargetFramework> 6 <TargetFramework>netcoreapp3.1</TargetFramework>
7 <DebugType>embedded</DebugType>
7 <IsPackable>false</IsPackable> 8 <IsPackable>false</IsPackable>
8 </PropertyGroup> 9 </PropertyGroup>
9 10
10 <ItemGroup> 11 <ItemGroup>
11 <Content Include="TestData\UsingDotNetCorePackages\BundleLatest.wxs" CopyToOutputDirectory="PreserveNewest" /> 12 <Content Include="TestData\**" CopyToOutputDirectory="PreserveNewest" />
12 <Content Include="TestData\UsingDotNetCorePackages\BundleLatest_x64.wxs" CopyToOutputDirectory="PreserveNewest" />
13 <Content Include="TestData\UsingNativeImage\example.txt" CopyToOutputDirectory="PreserveNewest" />
14 <Content Include="TestData\UsingNativeImage\Package.en-us.wxl" CopyToOutputDirectory="PreserveNewest" />
15 <Content Include="TestData\UsingNativeImage\Package.wxs" CopyToOutputDirectory="PreserveNewest" />
16 <Content Include="TestData\UsingNativeImage\PackageComponents.wxs" CopyToOutputDirectory="PreserveNewest" />
17 </ItemGroup> 13 </ItemGroup>
18 14
19 <Target Name="CopyExtensions" AfterTargets="Build">
20 <Copy DestinationFolder="$(OutputPath)" SourceFiles="@(WixExtension)" />
21 </Target>
22
23 <ItemGroup> 15 <ItemGroup>
24 <ProjectReference Include="..\..\wixext\WixToolset.Netfx.wixext.csproj" /> 16 <ProjectReference Include="..\..\wixext\WixToolset.Netfx.wixext.csproj" />
25 </ItemGroup> 17 </ItemGroup>
@@ -41,4 +33,8 @@
41 <PackageReference Include="xunit" Version="2.4.1" /> 33 <PackageReference Include="xunit" Version="2.4.1" />
42 <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" PrivateAssets="All" /> 34 <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" PrivateAssets="All" />
43 </ItemGroup> 35 </ItemGroup>
36
37 <Target Name="CopyExtensions" AfterTargets="Build">
38 <Copy DestinationFolder="$(OutputPath)" SourceFiles="@(WixExtension)" />
39 </Target>
44</Project> 40</Project>
diff --git a/src/wixext/WixToolset.Netfx.wixext.csproj b/src/wixext/WixToolset.Netfx.wixext.csproj
index 2e59f0c4..7c1d55c1 100644
--- a/src/wixext/WixToolset.Netfx.wixext.csproj
+++ b/src/wixext/WixToolset.Netfx.wixext.csproj
@@ -4,38 +4,28 @@
4<Project Sdk="Microsoft.NET.Sdk"> 4<Project Sdk="Microsoft.NET.Sdk">
5 <PropertyGroup> 5 <PropertyGroup>
6 <TargetFramework>netstandard2.0</TargetFramework> 6 <TargetFramework>netstandard2.0</TargetFramework>
7 <DebugType>embedded</DebugType>
7 <RootNamespace>WixToolset.Netfx</RootNamespace> 8 <RootNamespace>WixToolset.Netfx</RootNamespace>
8 <Description>WiX Toolset .NET Framework Extension</Description> 9 <Description>WiX Toolset .NET Framework Extension</Description>
9 <Title>WiX Toolset .NET Framework Extension</Title> 10 <Title>WiX Toolset .NET Framework Extension</Title>
10 <DebugType>embedded</DebugType>
11 <NuspecFile>$(MSBuildThisFileName).nuspec</NuspecFile>
12 <IncludeSymbols>true</IncludeSymbols> 11 <IncludeSymbols>true</IncludeSymbols>
13 <NuspecProperties>Id=$(MSBuildThisFileName);Authors=$(Authors);Copyright=$(Copyright);Description=$(Description);Title=$(Title)</NuspecProperties>
14 </PropertyGroup> 12 </PropertyGroup>
15 13
16 <ItemGroup> 14 <ItemGroup>
17 <Content Include="$(MSBuildThisFileName).targets" />
18 <EmbeddedResource Include="$(OutputPath)..\netfx.wixlib" /> 15 <EmbeddedResource Include="$(OutputPath)..\netfx.wixlib" />
19 </ItemGroup> 16 </ItemGroup>
20 17
21 <ItemGroup> 18 <ItemGroup>
22 <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="all" /> 19 <ProjectReference Include="..\wixlib\netfx.wixproj" ReferenceOutputAssembly="false" Condition=" '$(NCrunch)'=='' " />
23 <PackageReference Include="WixToolset.Data" Version="4.0.*" PrivateAssets="all" />
24 <PackageReference Include="WixToolset.Extensibility" Version="4.0.*" PrivateAssets="all" />
25 </ItemGroup> 20 </ItemGroup>
26 21
27 <ItemGroup> 22 <ItemGroup>
28 <ProjectReference Include="..\wixlib\netfx.wixproj" ReferenceOutputAssembly="false" Condition=" '$(NCrunch)'=='' " /> 23 <PackageReference Include="WixToolset.Data" Version="4.0.*" PrivateAssets="all" />
24 <PackageReference Include="WixToolset.Extensibility" Version="4.0.*" PrivateAssets="all" />
29 </ItemGroup> 25 </ItemGroup>
30 26
31 <ItemGroup> 27 <ItemGroup>
28 <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="all" />
32 <PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" PrivateAssets="all" /> 29 <PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" PrivateAssets="all" />
33 </ItemGroup> 30 </ItemGroup>
34
35 <Target Name="SetNuspecProperties" DependsOnTargets="InitializeSourceControlInformation" AfterTargets="GetBuildVersion">
36 <PropertyGroup>
37 <NuspecBasePath>$(OutputPath)..\</NuspecBasePath>
38 <NuspecProperties>$(NuspecProperties);Version=$(BuildVersionSimple);RepositoryCommit=$(SourceRevisionId);RepositoryType=$(RepositoryType);RepositoryUrl=$(PrivateRepositoryUrl);ProjectFolder=$(MSBuildThisFileDirectory)</NuspecProperties>
39 </PropertyGroup>
40 </Target>
41</Project> 31</Project>
diff --git a/src/wixext/WixToolset.Netfx.wixext.nuspec b/src/wixext/WixToolset.Netfx.wixext.nuspec
index 280ccad5..ba3eaade 100644
--- a/src/wixext/WixToolset.Netfx.wixext.nuspec
+++ b/src/wixext/WixToolset.Netfx.wixext.nuspec
@@ -3,14 +3,13 @@
3 <metadata minClientVersion="4.0"> 3 <metadata minClientVersion="4.0">
4 <id>$id$</id> 4 <id>$id$</id>
5 <version>$version$</version> 5 <version>$version$</version>
6 <title>$title$</title>
7 <description>$description$</description>
6 <authors>$authors$</authors> 8 <authors>$authors$</authors>
7 <owners>$authors$</owners>
8 <license type="expression">MS-RL</license> 9 <license type="expression">MS-RL</license>
9 <projectUrl>https://github.com/wixtoolset/Netfx.wixext</projectUrl>
10 <requireLicenseAcceptance>false</requireLicenseAcceptance> 10 <requireLicenseAcceptance>false</requireLicenseAcceptance>
11 <title>$title$</title>
12 <description>$description$</description>
13 <copyright>$copyright$</copyright> 11 <copyright>$copyright$</copyright>
12 <projectUrl>$projectUrl$</projectUrl>
14 <repository type="$repositorytype$" url="$repositoryurl$" commit="$repositorycommit$" /> 13 <repository type="$repositorytype$" url="$repositoryurl$" commit="$repositorycommit$" />
15 </metadata> 14 </metadata>
16 15
diff --git a/src/wixlib/netfx.wixproj b/src/wixlib/netfx.wixproj
index efe66e8e..937ed0d4 100644
--- a/src/wixlib/netfx.wixproj
+++ b/src/wixlib/netfx.wixproj
@@ -1,4 +1,6 @@
1<?xml version="1.0" encoding="utf-8"?>
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<!-- 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
2<Project Sdk="WixToolset.Sdk"> 4<Project Sdk="WixToolset.Sdk">
3 5
4 <PropertyGroup> 6 <PropertyGroup>
@@ -13,9 +15,9 @@
13 </ItemGroup> 15 </ItemGroup>
14 16
15 <ItemGroup> 17 <ItemGroup>
16 <ProjectReference Include="..\ca\netfxca.vcxproj" Properties="Platform=ARM64" /> 18 <ProjectReference Include="..\ca\netfxca.vcxproj" Properties="Platform=ARM64" ReferenceOutputAssembly="false" />
17 <ProjectReference Include="..\ca\netfxca.vcxproj" Properties="Platform=x86" /> 19 <ProjectReference Include="..\ca\netfxca.vcxproj" Properties="Platform=x86" ReferenceOutputAssembly="false" />
18 <ProjectReference Include="..\ca\netfxca.vcxproj" Properties="Platform=x64" /> 20 <ProjectReference Include="..\ca\netfxca.vcxproj" Properties="Platform=x64" ReferenceOutputAssembly="false" />
19 </ItemGroup> 21 </ItemGroup>
20 22
21 <ItemGroup> 23 <ItemGroup>
@@ -27,10 +29,4 @@
27 <PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" PrivateAssets="All" /> 29 <PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" PrivateAssets="All" />
28 </ItemGroup> 30 </ItemGroup>
29 31
30 <!-- Workaround for bug in ProjectReferenceDefineConstants, they're not needed for this project anyway -->
31 <Target Name="ClearProjectReferenceDefineConstants" AfterTargets="CalculateDefineConstants">
32 <PropertyGroup>
33 <ProjectReferenceDefineConstants></ProjectReferenceDefineConstants>
34 </PropertyGroup>
35 </Target>
36</Project> 32</Project>
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-03-26 00:32:51 +0000