Build tweaks to support VS 17.8...
...because SemVer is just a suggestion. - Also fix missing NuGet cleanup. - And update NuGet^2 packages because v6.3.1 has vulnerabilities.
Bob Arnson committed
Nov 26, 2023 at 22:40 UTC
5f23086a29aac7f0cbbe3b2e3d2f980d15e447c7
6 files changed
+19
-4
src/api/burn/test/WixToolsetTest.Mba.Core/WixToolsetTest.Mba.Core.csproj
+1
@@ -5,6 +5,7 @@
5
<PropertyGroup>
6
<TargetFramework>net6.0</TargetFramework>
7
<RuntimeIdentifier>win-x86</RuntimeIdentifier>
8
+ <SelfContained>false</SelfContained>
9
<IsWixTestProject>true</IsWixTestProject>
10
</PropertyGroup>
11
src/clean.cmd
+7
@@ -25,6 +25,7 @@ if exist "%_NUGET_CACHE%\wixtoolset.balutil" rd /s/q "%_NUGET_CACHE%\wixtoolset.
25
if exist "%_NUGET_CACHE%\wixtoolset.bextutil" rd /s/q "%_NUGET_CACHE%\wixtoolset.bextutil"
26
if exist "%_NUGET_CACHE%\wixtoolset.bootstrappercore.native" rd /s/q "%_NUGET_CACHE%\wixtoolset.bootstrappercore.native"
27
if exist "%_NUGET_CACHE%\wixtoolset.burn" rd /s/q "%_NUGET_CACHE%\wixtoolset.burn"
28
+if exist "%_NUGET_CACHE%\wixtoolset.complus.wixext" rd /s/q "%_NUGET_CACHE%\wixtoolset.complus.wixext"
29
if exist "%_NUGET_CACHE%\wixtoolset.converters" rd /s/q "%_NUGET_CACHE%\wixtoolset.converters"
30
if exist "%_NUGET_CACHE%\wixtoolset.core" rd /s/q "%_NUGET_CACHE%\wixtoolset.core"
31
if exist "%_NUGET_CACHE%\wixtoolset.core.burn" rd /s/q "%_NUGET_CACHE%\wixtoolset.core.burn"
@@ -33,6 +34,7 @@ if exist "%_NUGET_CACHE%\wixtoolset.core.native" rd /s/q "%_NUGET_CACHE%\wixtool
34
if exist "%_NUGET_CACHE%\wixtoolset.core.windowsinstaller" rd /s/q "%_NUGET_CACHE%\wixtoolset.core.windowsinstaller"
35
if exist "%_NUGET_CACHE%\wixtoolset.data" rd /s/q "%_NUGET_CACHE%\wixtoolset.data"
36
if exist "%_NUGET_CACHE%\wixtoolset.dependency.wixext" rd /s/q "%_NUGET_CACHE%\wixtoolset.dependency.wixext"
37
+if exist "%_NUGET_CACHE%\wixtoolset.directx.wixext" rd /s/q "%_NUGET_CACHE%\wixtoolset.directx.wixext"
38
if exist "%_NUGET_CACHE%\wixtoolset.dnc.hostgenerator" rd /s/q "%_NUGET_CACHE%\wixtoolset.dnc.hostgenerator"
39
if exist "%_NUGET_CACHE%\wixtoolset.dtf.compression" rd /s/q "%_NUGET_CACHE%\wixtoolset.dtf.compression"
40
if exist "%_NUGET_CACHE%\wixtoolset.dtf.compression.cab" rd /s/q "%_NUGET_CACHE%\wixtoolset.dtf.compression.cab"
@@ -46,13 +48,18 @@ if exist "%_NUGET_CACHE%\wixtoolset.dutil" rd /s/q "%_NUGET_CACHE%\wixtoolset.du
48
if exist "%_NUGET_CACHE%\wixtoolset.extensibility" rd /s/q "%_NUGET_CACHE%\wixtoolset.extensibility"
49
if exist "%_NUGET_CACHE%\wixtoolset.firewall.wixext" rd /s/q "%_NUGET_CACHE%\wixtoolset.firewall.wixext"
50
if exist "%_NUGET_CACHE%\wixtoolset.heat" rd /s/q "%_NUGET_CACHE%\wixtoolset.heat"
51
+if exist "%_NUGET_CACHE%\wixtoolset.http.wixext" rd /s/q "%_NUGET_CACHE%\wixtoolset.http.wixext"
52
if exist "%_NUGET_CACHE%\wixtoolset.iis.wixext" rd /s/q "%_NUGET_CACHE%\wixtoolset.iis.wixext"
53
if exist "%_NUGET_CACHE%\wixtoolset.mba.core" rd /s/q "%_NUGET_CACHE%\wixtoolset.mba.core"
54
+if exist "%_NUGET_CACHE%\wixtoolset.msmq.wixext" rd /s/q "%_NUGET_CACHE%\wixtoolset.msmq.wixext"
55
if exist "%_NUGET_CACHE%\wixtoolset.netfx.wixext" rd /s/q "%_NUGET_CACHE%\wixtoolset.netfx.wixext"
56
+if exist "%_NUGET_CACHE%\wixtoolset.powershell.wixext" rd /s/q "%_NUGET_CACHE%\wixtoolset.powershell.wixext"
57
if exist "%_NUGET_CACHE%\wixtoolset.sdk" rd /s/q "%_NUGET_CACHE%\wixtoolset.sdk"
58
+if exist "%_NUGET_CACHE%\wixtoolset.sql.wixext" rd /s/q "%_NUGET_CACHE%\wixtoolset.sql.wixext"
59
if exist "%_NUGET_CACHE%\wixtoolset.util.wixext" rd /s/q "%_NUGET_CACHE%\wixtoolset.util.wixext"
60
if exist "%_NUGET_CACHE%\wixtoolset.ui.wixext" rd /s/q "%_NUGET_CACHE%\wixtoolset.ui.wixext"
61
if exist "%_NUGET_CACHE%\wixtoolset.versioning" rd /s/q "%_NUGET_CACHE%\wixtoolset.versioning"
62
+if exist "%_NUGET_CACHE%\wixtoolset.visualstudio.wixext" rd /s/q "%_NUGET_CACHE%\wixtoolset.visualstudio.wixext"
63
if exist "%_NUGET_CACHE%\wixtoolset.wcautil" rd /s/q "%_NUGET_CACHE%\wixtoolset.wcautil"
64
if exist "%_NUGET_CACHE%\wix" rd /s/q "%_NUGET_CACHE%\wix"
65
src/ext/Bal/test/examples/examples.proj
+6
-1
@@ -39,7 +39,12 @@
39
Condition="'%(CoreMBAProject.SkipFDD)'==''" />
40
<Exec Command='dotnet publish -o "%(CoreMBAProject.PublishPath)\scd" -r win-x64 -c $(Configuration) --self-contained true "%(CoreMBAProject.Identity)"'
41
Condition="'%(CoreMBAProject.SkipSCD)'==''" />
42
- <Exec Command='dotnet publish -o "%(CoreMBAProject.PublishPath)\trimmedscd" -r win-x64 -c $(Configuration) --self-contained true -p:PublishTrimmed=true -p:TrimMode=%(CoreMBAProject.TrimMode) "%(CoreMBAProject.Identity)"'
42
+ <!--
43
+ Publishing a library is "undefined" (per https://github.com/dotnet/runtime/issues/91535)
44
+ and is now a build error. This will go away when BAs go out of proc, so not spending a
45
+ lot of time to keep building trimmed in VS 17.8.
46
+ -->
47
+ <Exec Command='dotnet publish -o "%(CoreMBAProject.PublishPath)\trimmedscd" -r win-x64 -c $(Configuration) --self-contained true -p:PublishTrimmed=false -p:TrimMode=%(CoreMBAProject.TrimMode) "%(CoreMBAProject.Identity)"'
48
Condition="'%(CoreMBAProject.TrimMode)'!=''" />
49
</Target>
50
src/internal/SetBuildNumber/Directory.Packages.props.pp
+3
-3
@@ -70,9 +70,9 @@
70
</ItemGroup>
71
72
<ItemGroup>
73
- <PackageVersion Include="NuGet.Credentials" Version="6.3.1" />
74
- <PackageVersion Include="NuGet.Protocol" Version="6.3.1" />
75
- <PackageVersion Include="NuGet.Versioning" Version="6.3.1" />
73
+ <PackageVersion Include="NuGet.Credentials" Version="6.3.3" />
74
+ <PackageVersion Include="NuGet.Protocol" Version="6.3.3" />
75
+ <PackageVersion Include="NuGet.Versioning" Version="6.3.3" />
76
</ItemGroup>
77
78
<!--
src/wix/test/WixToolsetTest.Core.Native/WixToolsetTest.Core.Native.csproj
+1
@@ -5,6 +5,7 @@
5
<PropertyGroup>
6
<TargetFramework>net6.0</TargetFramework>
7
<RuntimeIdentifier>win-x64</RuntimeIdentifier>
8
+ <SelfContained>false</SelfContained>
9
<RequiresNativeWixAssets>true</RequiresNativeWixAssets>
10
<IsWixTestProject>true</IsWixTestProject>
11
</PropertyGroup>
src/wix/test/WixToolsetTest.Sdk/TestData/MultiTargetingWixlib/TestExe/TestExe.csproj
+1
@@ -4,6 +4,7 @@
4
<OutputType>Exe</OutputType>
5
<TargetFrameworks>net6.0;net472</TargetFrameworks>
6
<RuntimeIdentifiers>win-x86;win-x64</RuntimeIdentifiers>
7
+ <SelfContained>false</SelfContained>
8
</PropertyGroup>
9
10
<ItemGroup>