@joebigelow / wix / commits / 3edfc342

Fixes required to get build working using MSBuild64 from VS2022

Rob Mensching committed Nov 29, 2021 at 11:22 UTC 3edfc3425d213d8d63120ece61f01a3e81a38333
2 files changed +2 -2
src/ext/Bal/test/WixToolsetTest.ManagedHost/DncHostFixture.cs
+1 -1
@@ -47,7 +47,7 @@ namespace WixToolsetTest.ManagedHost
47 }
48 }
49
50 - [Fact]
50 + [Fact(Skip="Fails in MSBuild64 - https://github.com/wixtoolset/issues/issues/6651")]
51 public void CanLoadTrimmedSCDEarliestCoreMBA()
52 {
53 using (var fs = new DisposableFileSystem())
src/internal/WixBuildTools.TestSupport.Native/build/WixBuildTools.TestSupport.Native.targets
+1 -1
@@ -42,7 +42,7 @@
42 <Error Condition="!Exists('$(RootPackagesFolder)xunit.runner.visualstudio.2.4.1\build\net20\xunit.runner.visualstudio.props')" Text="$([System.String]::Format('$(ErrorText)', '$(RootPackagesFolder)xunit.runner.visualstudio.2.4.1\build\net20\xunit.runner.visualstudio.props'))" />
43 </Target>
44
45 - <UsingTask AssemblyFile="$(RootPackagesFolder)xunit.runner.msbuild.2.4.1\build\net452\xunit.runner.msbuild.net452.dll" TaskName="Xunit.Runner.MSBuild.xunit" />
45 + <UsingTask AssemblyFile="$(RootPackagesFolder)xunit.runner.msbuild.2.4.1\build\net452\xunit.runner.msbuild.net452.dll" TaskName="Xunit.Runner.MSBuild.xunit" Architecture="x86" />
46 <Target Name="Test" DependsOnTargets="Build">
47 <xunit Assemblies="$(TargetPath)" />
48 </Target>