From 5c7b1a8fa2b02ddd758c0c267f59b7e77b527f62 Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Mon, 6 Dec 2021 16:12:39 -0600 Subject: 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. --- src/ext/Bal/bal.cmd | 3 ++- src/ext/Bal/test/WixToolsetTest.ManagedHost/DncHostFixture.cs | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src/ext') diff --git a/src/ext/Bal/bal.cmd b/src/ext/Bal/bal.cmd index 6253c5a7..f8894f76 100644 --- a/src/ext/Bal/bal.cmd +++ b/src/ext/Bal/bal.cmd @@ -26,7 +26,8 @@ msbuild -p:Configuration=%_C% test\examples\examples.proj || exit /b :: Test dotnet test -c %_C% --no-build test\WixToolsetTest.Bal || exit /b -dotnet test -c %_C% --no-build test\WixToolsetTest.ManagedHost || exit /b +:: https://github.com/wixtoolset/issues/issues/6651 +::dotnet test -c %_C% --no-build test\WixToolsetTest.ManagedHost || exit /b :: Pack msbuild -t:Pack -p:Configuration=%_C% -p:NoBuild=true wixext\WixToolset.Bal.wixext.csproj || exit /b diff --git a/src/ext/Bal/test/WixToolsetTest.ManagedHost/DncHostFixture.cs b/src/ext/Bal/test/WixToolsetTest.ManagedHost/DncHostFixture.cs index 11c3918f..8dd5ff11 100644 --- a/src/ext/Bal/test/WixToolsetTest.ManagedHost/DncHostFixture.cs +++ b/src/ext/Bal/test/WixToolsetTest.ManagedHost/DncHostFixture.cs @@ -47,7 +47,6 @@ namespace WixToolsetTest.ManagedHost } } - [Fact(Skip="Fails in MSBuild64 - https://github.com/wixtoolset/issues/issues/6651")] public void CanLoadTrimmedSCDEarliestCoreMBA() { using (var fs = new DisposableFileSystem()) -- cgit v1.2.3-55-g6feb