diff options
10 files changed, 15 insertions, 10 deletions
diff --git a/src/dtf/WixToolsetTests.Dtf.Compression.Cab/WixToolsetTests.Dtf.Compression.Cab.csproj b/src/dtf/WixToolsetTests.Dtf.Compression.Cab/WixToolsetTests.Dtf.Compression.Cab.csproj index e215b227..ddcf68ac 100644 --- a/src/dtf/WixToolsetTests.Dtf.Compression.Cab/WixToolsetTests.Dtf.Compression.Cab.csproj +++ b/src/dtf/WixToolsetTests.Dtf.Compression.Cab/WixToolsetTests.Dtf.Compression.Cab.csproj | |||
@@ -1,6 +1,6 @@ | |||
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" 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> | 4 | <PropertyGroup> |
5 | <ProjectGuid>{4544158C-2D63-4146-85FF-62169280144E}</ProjectGuid> | 5 | <ProjectGuid>{4544158C-2D63-4146-85FF-62169280144E}</ProjectGuid> |
6 | <OutputType>Library</OutputType> | 6 | <OutputType>Library</OutputType> |
@@ -9,6 +9,7 @@ | |||
9 | <ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> | 9 | <ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> |
10 | <CreateDocumentation>false</CreateDocumentation> | 10 | <CreateDocumentation>false</CreateDocumentation> |
11 | <SignOutput>false</SignOutput> | 11 | <SignOutput>false</SignOutput> |
12 | <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion> | ||
12 | </PropertyGroup> | 13 | </PropertyGroup> |
13 | 14 | ||
14 | <ItemGroup> | 15 | <ItemGroup> |
diff --git a/src/dtf/WixToolsetTests.Dtf.Compression.Zip/WixToolsetTests.Dtf.Compression.Zip.csproj b/src/dtf/WixToolsetTests.Dtf.Compression.Zip/WixToolsetTests.Dtf.Compression.Zip.csproj index c9d7007b..3e7fcb7e 100644 --- a/src/dtf/WixToolsetTests.Dtf.Compression.Zip/WixToolsetTests.Dtf.Compression.Zip.csproj +++ b/src/dtf/WixToolsetTests.Dtf.Compression.Zip/WixToolsetTests.Dtf.Compression.Zip.csproj | |||
@@ -1,6 +1,6 @@ | |||
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 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> | 4 | <PropertyGroup> |
5 | <ProjectGuid>{328799BB-7B03-4B28-8180-4132211FD07D}</ProjectGuid> | 5 | <ProjectGuid>{328799BB-7B03-4B28-8180-4132211FD07D}</ProjectGuid> |
6 | <OutputType>Library</OutputType> | 6 | <OutputType>Library</OutputType> |
@@ -9,6 +9,7 @@ | |||
9 | <ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> | 9 | <ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> |
10 | <CreateDocumentation>false</CreateDocumentation> | 10 | <CreateDocumentation>false</CreateDocumentation> |
11 | <SignOutput>false</SignOutput> | 11 | <SignOutput>false</SignOutput> |
12 | <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion> | ||
12 | </PropertyGroup> | 13 | </PropertyGroup> |
13 | 14 | ||
14 | <ItemGroup> | 15 | <ItemGroup> |
diff --git a/src/dtf/WixToolsetTests.Dtf.Compression/WixToolsetTests.Dtf.Compression.csproj b/src/dtf/WixToolsetTests.Dtf.Compression/WixToolsetTests.Dtf.Compression.csproj index 55449ee2..83040938 100644 --- a/src/dtf/WixToolsetTests.Dtf.Compression/WixToolsetTests.Dtf.Compression.csproj +++ b/src/dtf/WixToolsetTests.Dtf.Compression/WixToolsetTests.Dtf.Compression.csproj | |||
@@ -1,6 +1,6 @@ | |||
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 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> | 4 | <PropertyGroup> |
5 | <ProjectGuid>{F045FFC1-05F9-4EA2-9F03-E1CBDB7BC4F9}</ProjectGuid> | 5 | <ProjectGuid>{F045FFC1-05F9-4EA2-9F03-E1CBDB7BC4F9}</ProjectGuid> |
6 | <OutputType>Library</OutputType> | 6 | <OutputType>Library</OutputType> |
@@ -8,6 +8,7 @@ | |||
8 | <AssemblyName>WixToolsetTests.Dtf.Compression</AssemblyName> | 8 | <AssemblyName>WixToolsetTests.Dtf.Compression</AssemblyName> |
9 | <CreateDocumentation>false</CreateDocumentation> | 9 | <CreateDocumentation>false</CreateDocumentation> |
10 | <SignOutput>false</SignOutput> | 10 | <SignOutput>false</SignOutput> |
11 | <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion> | ||
11 | </PropertyGroup> | 12 | </PropertyGroup> |
12 | 13 | ||
13 | <ItemGroup> | 14 | <ItemGroup> |
diff --git a/src/dtf/WixToolsetTests.Dtf.WindowsInstaller.CustomActions/WixToolsetTests.Dtf.WindowsInstaller.CustomActions.csproj b/src/dtf/WixToolsetTests.Dtf.WindowsInstaller.CustomActions/WixToolsetTests.Dtf.WindowsInstaller.CustomActions.csproj index 911568e7..6a053026 100644 --- a/src/dtf/WixToolsetTests.Dtf.WindowsInstaller.CustomActions/WixToolsetTests.Dtf.WindowsInstaller.CustomActions.csproj +++ b/src/dtf/WixToolsetTests.Dtf.WindowsInstaller.CustomActions/WixToolsetTests.Dtf.WindowsInstaller.CustomActions.csproj | |||
@@ -1,6 +1,6 @@ | |||
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" 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> | 4 | <PropertyGroup> |
5 | <ProjectGuid>{137D376B-989F-4FEA-9A67-01D8D38CA0DE}</ProjectGuid> | 5 | <ProjectGuid>{137D376B-989F-4FEA-9A67-01D8D38CA0DE}</ProjectGuid> |
6 | <OutputType>Library</OutputType> | 6 | <OutputType>Library</OutputType> |
@@ -9,6 +9,7 @@ | |||
9 | <ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> | 9 | <ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> |
10 | <CreateDocumentation>false</CreateDocumentation> | 10 | <CreateDocumentation>false</CreateDocumentation> |
11 | <SignOutput>false</SignOutput> | 11 | <SignOutput>false</SignOutput> |
12 | <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion> | ||
12 | </PropertyGroup> | 13 | </PropertyGroup> |
13 | 14 | ||
14 | <ItemGroup> | 15 | <ItemGroup> |
diff --git a/src/dtf/WixToolsetTests.Dtf.WindowsInstaller.Linq/WixToolsetTests.Dtf.WindowsInstaller.Linq.csproj b/src/dtf/WixToolsetTests.Dtf.WindowsInstaller.Linq/WixToolsetTests.Dtf.WindowsInstaller.Linq.csproj index 8584f27a..e7fbf28d 100644 --- a/src/dtf/WixToolsetTests.Dtf.WindowsInstaller.Linq/WixToolsetTests.Dtf.WindowsInstaller.Linq.csproj +++ b/src/dtf/WixToolsetTests.Dtf.WindowsInstaller.Linq/WixToolsetTests.Dtf.WindowsInstaller.Linq.csproj | |||
@@ -1,6 +1,6 @@ | |||
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" 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> | 4 | <PropertyGroup> |
5 | <ProjectGuid>{4F55F9B8-D8B6-41EB-8796-221B4CD98324}</ProjectGuid> | 5 | <ProjectGuid>{4F55F9B8-D8B6-41EB-8796-221B4CD98324}</ProjectGuid> |
6 | <OutputType>Library</OutputType> | 6 | <OutputType>Library</OutputType> |
@@ -9,6 +9,7 @@ | |||
9 | <ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> | 9 | <ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> |
10 | <CreateDocumentation>false</CreateDocumentation> | 10 | <CreateDocumentation>false</CreateDocumentation> |
11 | <SignOutput>false</SignOutput> | 11 | <SignOutput>false</SignOutput> |
12 | <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion> | ||
12 | </PropertyGroup> | 13 | </PropertyGroup> |
13 | 14 | ||
14 | <ItemGroup> | 15 | <ItemGroup> |
diff --git a/src/dtf/WixToolsetTests.Dtf.WindowsInstaller/WixToolsetTests.Dtf.WindowsInstaller.csproj b/src/dtf/WixToolsetTests.Dtf.WindowsInstaller/WixToolsetTests.Dtf.WindowsInstaller.csproj index eb3b9f9c..1fedfe4e 100644 --- a/src/dtf/WixToolsetTests.Dtf.WindowsInstaller/WixToolsetTests.Dtf.WindowsInstaller.csproj +++ b/src/dtf/WixToolsetTests.Dtf.WindowsInstaller/WixToolsetTests.Dtf.WindowsInstaller.csproj | |||
@@ -1,6 +1,6 @@ | |||
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" 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> | 4 | <PropertyGroup> |
5 | <ProjectGuid>{16F5202F-9276-4166-975C-C9654BAF8012}</ProjectGuid> | 5 | <ProjectGuid>{16F5202F-9276-4166-975C-C9654BAF8012}</ProjectGuid> |
6 | <OutputType>Library</OutputType> | 6 | <OutputType>Library</OutputType> |
@@ -9,6 +9,7 @@ | |||
9 | <ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> | 9 | <ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> |
10 | <CreateDocumentation>false</CreateDocumentation> | 10 | <CreateDocumentation>false</CreateDocumentation> |
11 | <SignOutput>false</SignOutput> | 11 | <SignOutput>false</SignOutput> |
12 | <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion> | ||
12 | </PropertyGroup> | 13 | </PropertyGroup> |
13 | 14 | ||
14 | <ItemGroup> | 15 | <ItemGroup> |
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 | |||
26 | 26 | ||
27 | :: Test | 27 | :: Test |
28 | dotnet test -c %_C% --no-build test\WixToolsetTest.Bal || exit /b | 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 | ||
30 | 31 | ||
31 | :: Pack | 32 | :: Pack |
32 | msbuild -t:Pack -p:Configuration=%_C% -p:NoBuild=true wixext\WixToolset.Bal.wixext.csproj || exit /b | 33 | 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 | |||
47 | } | 47 | } |
48 | } | 48 | } |
49 | 49 | ||
50 | [Fact(Skip="Fails in MSBuild64 - https://github.com/wixtoolset/issues/issues/6651")] | ||
51 | public void CanLoadTrimmedSCDEarliestCoreMBA() | 50 | public void CanLoadTrimmedSCDEarliestCoreMBA() |
52 | { | 51 | { |
53 | using (var fs = new DisposableFileSystem()) | 52 | using (var fs = new DisposableFileSystem()) |
diff --git a/src/internal/SetBuildNumber/Directory.Packages.props.pp b/src/internal/SetBuildNumber/Directory.Packages.props.pp index 65496a36..ff73265c 100644 --- a/src/internal/SetBuildNumber/Directory.Packages.props.pp +++ b/src/internal/SetBuildNumber/Directory.Packages.props.pp | |||
@@ -42,7 +42,6 @@ | |||
42 | <PackageVersion Include="System.Text.Encoding.CodePages" Version="4.6.0" /> | 42 | <PackageVersion Include="System.Text.Encoding.CodePages" Version="4.6.0" /> |
43 | 43 | ||
44 | <PackageVersion Include="Microsoft.AspNetCore.Owin" Version="3.1.13" /> | 44 | <PackageVersion Include="Microsoft.AspNetCore.Owin" Version="3.1.13" /> |
45 | <PackageVersion Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0" /> | ||
46 | <PackageVersion Include="Microsoft.VisualStudio.Setup.Configuration.Native" Version="1.14.114" /> | 45 | <PackageVersion Include="Microsoft.VisualStudio.Setup.Configuration.Native" Version="1.14.114" /> |
47 | <PackageVersion Include="Microsoft.Win32.Registry" Version="4.7.0" /> | 46 | <PackageVersion Include="Microsoft.Win32.Registry" Version="4.7.0" /> |
48 | 47 | ||
diff --git a/src/wix/test/WixToolsetTest.Sdk/TestData/HeatProject/ToolsVersion4Cs/ToolsVersion4Cs.csproj b/src/wix/test/WixToolsetTest.Sdk/TestData/HeatProject/ToolsVersion4Cs/ToolsVersion4Cs.csproj index 9c55f7a5..e5723ea2 100644 --- a/src/wix/test/WixToolsetTest.Sdk/TestData/HeatProject/ToolsVersion4Cs/ToolsVersion4Cs.csproj +++ b/src/wix/test/WixToolsetTest.Sdk/TestData/HeatProject/ToolsVersion4Cs/ToolsVersion4Cs.csproj | |||
@@ -8,7 +8,7 @@ | |||
8 | <AssemblyName>ToolsVersion4Cs</AssemblyName> | 8 | <AssemblyName>ToolsVersion4Cs</AssemblyName> |
9 | <OutputType>Library</OutputType> | 9 | <OutputType>Library</OutputType> |
10 | <RootNamespace>ToolsVersion4Cs</RootNamespace> | 10 | <RootNamespace>ToolsVersion4Cs</RootNamespace> |
11 | <TargetFrameworkVersion>v4.0</TargetFrameworkVersion> | 11 | <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion> |
12 | </PropertyGroup> | 12 | </PropertyGroup> |
13 | <PropertyGroup Condition=" '$(Configuration)' == 'Debug' "> | 13 | <PropertyGroup Condition=" '$(Configuration)' == 'Debug' "> |
14 | <DebugSymbols>true</DebugSymbols> | 14 | <DebugSymbols>true</DebugSymbols> |