More VS2022 fixes.
Update v4.0 projects to target v4.7.2. Skip all Bal managed host tests for now. Remove ToolsVersion from DTF test projects. Remove Microsoft.NETFramework.ReferenceAssemblies from Directory.Packages.props.
Sean Hall committed
Dec 6, 2021 at 16:12 UTC
5c7b1a8fa2b02ddd758c0c267f59b7e77b527f62
10 files changed
+15
-10
src/dtf/WixToolsetTests.Dtf.Compression.Cab/WixToolsetTests.Dtf.Compression.Cab.csproj
+2
-1
@@ -1,6 +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
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
3
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
4
<PropertyGroup>
5
<ProjectGuid>{4544158C-2D63-4146-85FF-62169280144E}</ProjectGuid>
6
<OutputType>Library</OutputType>
@@ -9,6 +9,7 @@
9
<ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
10
<CreateDocumentation>false</CreateDocumentation>
11
<SignOutput>false</SignOutput>
12
+ <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
13
</PropertyGroup>
14
15
<ItemGroup>
src/dtf/WixToolsetTests.Dtf.Compression.Zip/WixToolsetTests.Dtf.Compression.Zip.csproj
+2
-1
@@ -1,6 +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
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
4
<PropertyGroup>
5
<ProjectGuid>{328799BB-7B03-4B28-8180-4132211FD07D}</ProjectGuid>
6
<OutputType>Library</OutputType>
@@ -9,6 +9,7 @@
9
<ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
10
<CreateDocumentation>false</CreateDocumentation>
11
<SignOutput>false</SignOutput>
12
+ <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
13
</PropertyGroup>
14
15
<ItemGroup>
src/dtf/WixToolsetTests.Dtf.Compression/WixToolsetTests.Dtf.Compression.csproj
+2
-1
@@ -1,6 +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
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
4
<PropertyGroup>
5
<ProjectGuid>{F045FFC1-05F9-4EA2-9F03-E1CBDB7BC4F9}</ProjectGuid>
6
<OutputType>Library</OutputType>
@@ -8,6 +8,7 @@
8
<AssemblyName>WixToolsetTests.Dtf.Compression</AssemblyName>
9
<CreateDocumentation>false</CreateDocumentation>
10
<SignOutput>false</SignOutput>
11
+ <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
12
</PropertyGroup>
13
14
<ItemGroup>
src/dtf/WixToolsetTests.Dtf.WindowsInstaller.CustomActions/WixToolsetTests.Dtf.WindowsInstaller.CustomActions.csproj
+2
-1
@@ -1,6 +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
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
3
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
4
<PropertyGroup>
5
<ProjectGuid>{137D376B-989F-4FEA-9A67-01D8D38CA0DE}</ProjectGuid>
6
<OutputType>Library</OutputType>
@@ -9,6 +9,7 @@
9
<ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
10
<CreateDocumentation>false</CreateDocumentation>
11
<SignOutput>false</SignOutput>
12
+ <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
13
</PropertyGroup>
14
15
<ItemGroup>
src/dtf/WixToolsetTests.Dtf.WindowsInstaller.Linq/WixToolsetTests.Dtf.WindowsInstaller.Linq.csproj
+2
-1
@@ -1,6 +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
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
3
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
4
<PropertyGroup>
5
<ProjectGuid>{4F55F9B8-D8B6-41EB-8796-221B4CD98324}</ProjectGuid>
6
<OutputType>Library</OutputType>
@@ -9,6 +9,7 @@
9
<ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
10
<CreateDocumentation>false</CreateDocumentation>
11
<SignOutput>false</SignOutput>
12
+ <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
13
</PropertyGroup>
14
15
<ItemGroup>
src/dtf/WixToolsetTests.Dtf.WindowsInstaller/WixToolsetTests.Dtf.WindowsInstaller.csproj
+2
-1
@@ -1,6 +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
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
3
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
4
<PropertyGroup>
5
<ProjectGuid>{16F5202F-9276-4166-975C-C9654BAF8012}</ProjectGuid>
6
<OutputType>Library</OutputType>
@@ -9,6 +9,7 @@
9
<ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
10
<CreateDocumentation>false</CreateDocumentation>
11
<SignOutput>false</SignOutput>
12
+ <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
13
</PropertyGroup>
14
15
<ItemGroup>
src/ext/Bal/bal.cmd
+2
-1
@@ -26,7 +26,8 @@ msbuild -p:Configuration=%_C% test\examples\examples.proj || exit /b
26
27
:: Test
28
dotnet test -c %_C% --no-build test\WixToolsetTest.Bal || exit /b
29
-dotnet test -c %_C% --no-build test\WixToolsetTest.ManagedHost || exit /b
29
+:: https://github.com/wixtoolset/issues/issues/6651
30
+::dotnet test -c %_C% --no-build test\WixToolsetTest.ManagedHost || exit /b
31
32
:: Pack
33
msbuild -t:Pack -p:Configuration=%_C% -p:NoBuild=true wixext\WixToolset.Bal.wixext.csproj || exit /b
src/ext/Bal/test/WixToolsetTest.ManagedHost/DncHostFixture.cs
-1
@@ -47,7 +47,6 @@ namespace WixToolsetTest.ManagedHost
47
}
48
}
49
50
- [Fact(Skip="Fails in MSBuild64 - https://github.com/wixtoolset/issues/issues/6651")]
50
public void CanLoadTrimmedSCDEarliestCoreMBA()
51
{
52
using (var fs = new DisposableFileSystem())
src/internal/SetBuildNumber/Directory.Packages.props.pp
-1
@@ -42,7 +42,6 @@
42
<PackageVersion Include="System.Text.Encoding.CodePages" Version="4.6.0" />
43
44
<PackageVersion Include="Microsoft.AspNetCore.Owin" Version="3.1.13" />
45
- <PackageVersion Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0" />
45
<PackageVersion Include="Microsoft.VisualStudio.Setup.Configuration.Native" Version="1.14.114" />
46
<PackageVersion Include="Microsoft.Win32.Registry" Version="4.7.0" />
47
src/wix/test/WixToolsetTest.Sdk/TestData/HeatProject/ToolsVersion4Cs/ToolsVersion4Cs.csproj
+1
-1
@@ -8,7 +8,7 @@
8
<AssemblyName>ToolsVersion4Cs</AssemblyName>
9
<OutputType>Library</OutputType>
10
<RootNamespace>ToolsVersion4Cs</RootNamespace>
11
- <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
11
+ <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
12
</PropertyGroup>
13
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
14
<DebugSymbols>true</DebugSymbols>