Drop XP support.

author: Sean Hall <r.sean.hall@gmail.com> 2020-05-15 13:48:12 +1000
committer: Sean Hall <r.sean.hall@gmail.com> 2020-05-16 21:47:46 +1000
commit: b0b50f1d8512b6d7ebd087d19406629db0a5ef9b (patch)
tree: 0e968627128148565398fa544102c753f7b2f438
parent: 1e7800b811b658659c8487bf2ccb541fdd6bd1be (diff)
download: wix-b0b50f1d8512b6d7ebd087d19406629db0a5ef9b.tar.gz
wix-b0b50f1d8512b6d7ebd087d19406629db0a5ef9b.tar.bz2
wix-b0b50f1d8512b6d7ebd087d19406629db0a5ef9b.zip
12 files changed, 28 insertions, 28 deletions
diff --git a/appveyor.cmd b/appveyor.cmd
index 8a7782de..ddad4dae 100644
--- a/appveyor.cmd
+++ b/appveyor.cmd
@@ -3,9 +3,9 @@
 nuget restore
-msbuild -p:Configuration=Release;Platform=x86;PlatformToolset=v140_xp
+msbuild -p:Configuration=Release;Platform=x86;PlatformToolset=v140
-msbuild -p:Configuration=Release;Platform=x86;PlatformToolset=v141_xp
+msbuild -p:Configuration=Release;Platform=x86;PlatformToolset=v141
 msbuild -p:Configuration=Release -t:Pack src\balutil\balutil.vcxproj
 msbuild -p:Configuration=Release -t:Pack src\bextutil\bextutil.vcxproj
diff --git a/appveyor.yml b/appveyor.yml
index c1df03cc..7c686b04 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -8,7 +8,7 @@ branches:
    - master
    - develop
-image: Visual Studio 2017
+image: Visual Studio 2019
 version: 0.0.0.{build}
 configuration: Release
diff --git a/src/WixToolset.Mba.Core/WixToolset.Mba.Core.nuspec b/src/WixToolset.Mba.Core/WixToolset.Mba.Core.nuspec
index d773bcf9..c7f4a97d 100644
--- a/src/WixToolset.Mba.Core/WixToolset.Mba.Core.nuspec
+++ b/src/WixToolset.Mba.Core/WixToolset.Mba.Core.nuspec
@@ -15,7 +15,7 @@
  <files>
    <file src="build\net20\$id$.props" target="build\net20" />
-    <file src="..\..\build\$configuration$\v141_xp\x86\mbanative.dll" target="build\net20\x86" />
+    <file src="..\..\build\$configuration$\v141\x86\mbanative.dll" target="build\net20\x86" />
    <file src="..\..\build\$configuration$\$id$.dll" target="lib\net20" />
  </files>
 </package>
diff --git a/src/balutil/balutil.nuspec b/src/balutil/balutil.nuspec
index 0a26004a..e82610e3 100644
--- a/src/balutil/balutil.nuspec
+++ b/src/balutil/balutil.nuspec
@@ -20,7 +20,7 @@
  <files>
    <file src="build\$id$.props" target="build\" />
    <file src="inc\*" target="build\native\include" />
-    <file src="..\..\build\$configuration$\v140_xp\x86\balutil.lib" target="build\native\v140\x86" />
+    <file src="..\..\build\$configuration$\v140\x86\balutil.lib" target="build\native\v140\x86" />
-    <file src="..\..\build\$configuration$\v141_xp\x86\balutil.lib" target="build\native\v141\x86" />
+    <file src="..\..\build\$configuration$\v141\x86\balutil.lib" target="build\native\v141\x86" />
  </files>
 </package>
diff --git a/src/balutil/balutil.vcxproj b/src/balutil/balutil.vcxproj
index 8c96c002..f37fde17 100644
--- a/src/balutil/balutil.vcxproj
+++ b/src/balutil/balutil.vcxproj
@@ -2,8 +2,8 @@
 <!-- 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. -->
 <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\packages\WixToolset.BootstrapperCore.Native.4.0.15\build\WixToolset.BootstrapperCore.Native.props" Condition="Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.15\build\WixToolset.BootstrapperCore.Native.props')" />
+  <Import Project="..\..\packages\WixToolset.BootstrapperCore.Native.4.0.16\build\WixToolset.BootstrapperCore.Native.props" Condition="Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.16\build\WixToolset.BootstrapperCore.Native.props')" />
-  <Import Project="..\..\packages\WixToolset.DUtil.4.0.18\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.18\build\WixToolset.DUtil.props')" />
+  <Import Project="..\..\packages\WixToolset.DUtil.4.0.22\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.22\build\WixToolset.DUtil.props')" />
  <ItemGroup Label="ProjectConfigurations">
    <ProjectConfiguration Include="Debug|Win32">
@@ -90,8 +90,8 @@
    <PropertyGroup>
      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
    </PropertyGroup>
-    <Error Condition="!Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.15\build\WixToolset.BootstrapperCore.Native.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.BootstrapperCore.Native.4.0.15\build\WixToolset.BootstrapperCore.Native.props'))" />
+    <Error Condition="!Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.16\build\WixToolset.BootstrapperCore.Native.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.BootstrapperCore.Native.4.0.16\build\WixToolset.BootstrapperCore.Native.props'))" />
-    <Error Condition="!Exists('..\..\packages\WixToolset.DUtil.4.0.18\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.DUtil.4.0.18\build\WixToolset.DUtil.props'))" />
+    <Error Condition="!Exists('..\..\packages\WixToolset.DUtil.4.0.22\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.DUtil.4.0.22\build\WixToolset.DUtil.props'))" />
    <Error Condition="!Exists('..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets'))" />
  </Target>
 </Project>
diff --git a/src/balutil/packages.config b/src/balutil/packages.config
index e9b2d190..7fb53719 100644
--- a/src/balutil/packages.config
+++ b/src/balutil/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
  <package id="Nerdbank.GitVersioning" version="2.1.65" targetFramework="native" developmentDependency="true" />
-  <package id="WixToolset.BootstrapperCore.Native" version="4.0.15" targetFramework="native" />
+  <package id="WixToolset.BootstrapperCore.Native" version="4.0.16" targetFramework="native" />
-  <package id="WixToolset.DUtil" version="4.0.18" targetFramework="native" />
+  <package id="WixToolset.DUtil" version="4.0.22" targetFramework="native" />
 </packages>
 \ No newline at end of file
diff --git a/src/bextutil/bextutil.nuspec b/src/bextutil/bextutil.nuspec
index 30e0871d..40488610 100644
--- a/src/bextutil/bextutil.nuspec
+++ b/src/bextutil/bextutil.nuspec
@@ -20,7 +20,7 @@
  <files>
    <file src="build\$id$.props" target="build\" />
    <file src="inc\*" target="build\native\include" />
-    <file src="..\..\build\$configuration$\v140_xp\x86\bextutil.lib" target="build\native\v140\x86" />
+    <file src="..\..\build\$configuration$\v140\x86\bextutil.lib" target="build\native\v140\x86" />
-    <file src="..\..\build\$configuration$\v141_xp\x86\bextutil.lib" target="build\native\v141\x86" />
+    <file src="..\..\build\$configuration$\v141\x86\bextutil.lib" target="build\native\v141\x86" />
  </files>
 </package>
diff --git a/src/bextutil/bextutil.vcxproj b/src/bextutil/bextutil.vcxproj
index eb552747..50c6c7d2 100644
--- a/src/bextutil/bextutil.vcxproj
+++ b/src/bextutil/bextutil.vcxproj
@@ -2,8 +2,8 @@
 <!-- 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. -->
 <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\packages\WixToolset.BootstrapperCore.Native.4.0.15\build\WixToolset.BootstrapperCore.Native.props" Condition="Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.15\build\WixToolset.BootstrapperCore.Native.props')" />
+  <Import Project="..\..\packages\WixToolset.BootstrapperCore.Native.4.0.16\build\WixToolset.BootstrapperCore.Native.props" Condition="Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.16\build\WixToolset.BootstrapperCore.Native.props')" />
-  <Import Project="..\..\packages\WixToolset.DUtil.4.0.18\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.18\build\WixToolset.DUtil.props')" />
+  <Import Project="..\..\packages\WixToolset.DUtil.4.0.22\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.22\build\WixToolset.DUtil.props')" />
  <ItemGroup Label="ProjectConfigurations">
    <ProjectConfiguration Include="Debug|Win32">
@@ -79,8 +79,8 @@
    <PropertyGroup>
      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
    </PropertyGroup>
-    <Error Condition="!Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.15\build\WixToolset.BootstrapperCore.Native.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.BootstrapperCore.Native.4.0.15\build\WixToolset.BootstrapperCore.Native.props'))" />
+    <Error Condition="!Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.16\build\WixToolset.BootstrapperCore.Native.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.BootstrapperCore.Native.4.0.16\build\WixToolset.BootstrapperCore.Native.props'))" />
-    <Error Condition="!Exists('..\..\packages\WixToolset.DUtil.4.0.18\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.DUtil.4.0.18\build\WixToolset.DUtil.props'))" />
+    <Error Condition="!Exists('..\..\packages\WixToolset.DUtil.4.0.22\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.DUtil.4.0.22\build\WixToolset.DUtil.props'))" />
    <Error Condition="!Exists('..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets'))" />
  </Target>
 </Project>
diff --git a/src/bextutil/packages.config b/src/bextutil/packages.config
index e9b2d190..7fb53719 100644
--- a/src/bextutil/packages.config
+++ b/src/bextutil/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
  <package id="Nerdbank.GitVersioning" version="2.1.65" targetFramework="native" developmentDependency="true" />
-  <package id="WixToolset.BootstrapperCore.Native" version="4.0.15" targetFramework="native" />
+  <package id="WixToolset.BootstrapperCore.Native" version="4.0.16" targetFramework="native" />
-  <package id="WixToolset.DUtil" version="4.0.18" targetFramework="native" />
+  <package id="WixToolset.DUtil" version="4.0.22" targetFramework="native" />
 </packages>
 \ No newline at end of file
diff --git a/src/mbanative/mbanative.vcxproj b/src/mbanative/mbanative.vcxproj
index 0cba46b5..5a998182 100644
--- a/src/mbanative/mbanative.vcxproj
+++ b/src/mbanative/mbanative.vcxproj
@@ -2,8 +2,8 @@
 <!-- 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. -->
 <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\packages\WixToolset.BootstrapperCore.Native.4.0.15\build\WixToolset.BootstrapperCore.Native.props" Condition="Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.15\build\WixToolset.BootstrapperCore.Native.props')" />
+  <Import Project="..\..\packages\WixToolset.BootstrapperCore.Native.4.0.16\build\WixToolset.BootstrapperCore.Native.props" Condition="Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.16\build\WixToolset.BootstrapperCore.Native.props')" />
-  <Import Project="..\..\packages\WixToolset.DUtil.4.0.18\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.18\build\WixToolset.DUtil.props')" />
+  <Import Project="..\..\packages\WixToolset.DUtil.4.0.22\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.22\build\WixToolset.DUtil.props')" />
  <ItemGroup Label="ProjectConfigurations">
    <ProjectConfiguration Include="Debug|Win32">
@@ -69,8 +69,8 @@
    <PropertyGroup>
      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
    </PropertyGroup>
-    <Error Condition="!Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.15\build\WixToolset.BootstrapperCore.Native.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.BootstrapperCore.Native.4.0.15\build\WixToolset.BootstrapperCore.Native.props'))" />
+    <Error Condition="!Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.16\build\WixToolset.BootstrapperCore.Native.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.BootstrapperCore.Native.4.0.16\build\WixToolset.BootstrapperCore.Native.props'))" />
-    <Error Condition="!Exists('..\..\packages\WixToolset.DUtil.4.0.18\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.DUtil.4.0.18\build\WixToolset.DUtil.props'))" />
+    <Error Condition="!Exists('..\..\packages\WixToolset.DUtil.4.0.22\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.DUtil.4.0.22\build\WixToolset.DUtil.props'))" />
    <Error Condition="!Exists('..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets'))" />
  </Target>
 </Project>
diff --git a/src/mbanative/packages.config b/src/mbanative/packages.config
index e9b2d190..7fb53719 100644
--- a/src/mbanative/packages.config
+++ b/src/mbanative/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
  <package id="Nerdbank.GitVersioning" version="2.1.65" targetFramework="native" developmentDependency="true" />
-  <package id="WixToolset.BootstrapperCore.Native" version="4.0.15" targetFramework="native" />
+  <package id="WixToolset.BootstrapperCore.Native" version="4.0.16" targetFramework="native" />
-  <package id="WixToolset.DUtil" version="4.0.18" targetFramework="native" />
+  <package id="WixToolset.DUtil" version="4.0.22" targetFramework="native" />
 </packages>
 \ No newline at end of file
diff --git a/src/test/WixToolsetTest.Mba.Core/WixToolsetTest.Mba.Core.csproj b/src/test/WixToolsetTest.Mba.Core/WixToolsetTest.Mba.Core.csproj
index d401d877..9959e261 100644
--- a/src/test/WixToolsetTest.Mba.Core/WixToolsetTest.Mba.Core.csproj
+++ b/src/test/WixToolsetTest.Mba.Core/WixToolsetTest.Mba.Core.csproj
@@ -3,7 +3,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
  <PropertyGroup>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
    <IsPackable>false</IsPackable>
    <Platforms>AnyCPU;x86;x64</Platforms>
  </PropertyGroup>
@@ -22,7 +22,7 @@
  </ItemGroup>
  <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.3.0" />
    <PackageReference Include="xunit" Version="2.4.1" />
    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" PrivateAssets="All" />
  </ItemGroup>
author	Sean Hall <r.sean.hall@gmail.com>	2020-05-15 13:48:12 +1000
committer	Sean Hall <r.sean.hall@gmail.com>	2020-05-16 21:47:46 +1000
commit	b0b50f1d8512b6d7ebd087d19406629db0a5ef9b (patch)
tree	0e968627128148565398fa544102c753f7b2f438
parent	1e7800b811b658659c8487bf2ccb541fdd6bd1be (diff)
download	wix-b0b50f1d8512b6d7ebd087d19406629db0a5ef9b.tar.gz wix-b0b50f1d8512b6d7ebd087d19406629db0a5ef9b.tar.bz2 wix-b0b50f1d8512b6d7ebd087d19406629db0a5ef9b.zip

diff --git a/appveyor.cmd b/appveyor.cmd index 8a7782de..ddad4dae 100644 --- a/appveyor.cmd +++ b/appveyor.cmd
@@ -3,9 +3,9 @@
3		3
4	nuget restore	4	nuget restore
5		5
6	msbuild -p:Configuration=Release;Platform=x86;PlatformToolset=v140_xp	6	msbuild -p:Configuration=Release;Platform=x86;PlatformToolset=v140
7		7
8	msbuild -p:Configuration=Release;Platform=x86;PlatformToolset=v141_xp	8	msbuild -p:Configuration=Release;Platform=x86;PlatformToolset=v141
9		9
10	msbuild -p:Configuration=Release -t:Pack src\balutil\balutil.vcxproj	10	msbuild -p:Configuration=Release -t:Pack src\balutil\balutil.vcxproj
11	msbuild -p:Configuration=Release -t:Pack src\bextutil\bextutil.vcxproj	11	msbuild -p:Configuration=Release -t:Pack src\bextutil\bextutil.vcxproj


diff --git a/appveyor.yml b/appveyor.yml index c1df03cc..7c686b04 100644 --- a/appveyor.yml +++ b/appveyor.yml
@@ -8,7 +8,7 @@ branches:
8	- master	8	- master
9	- develop	9	- develop
10		10
11	image: Visual Studio 2017	11	image: Visual Studio 2019
12		12
13	version: 0.0.0.{build}	13	version: 0.0.0.{build}
14	configuration: Release	14	configuration: Release


diff --git a/src/WixToolset.Mba.Core/WixToolset.Mba.Core.nuspec b/src/WixToolset.Mba.Core/WixToolset.Mba.Core.nuspec index d773bcf9..c7f4a97d 100644 --- a/src/WixToolset.Mba.Core/WixToolset.Mba.Core.nuspec +++ b/src/WixToolset.Mba.Core/WixToolset.Mba.Core.nuspec
@@ -15,7 +15,7 @@
15		15
16	<files>	16	<files>
17	<file src="build\net20\$id$.props" target="build\net20" />	17	<file src="build\net20\$id$.props" target="build\net20" />
18	<file src="..\..\build\$configuration$\v141_xp\x86\mbanative.dll" target="build\net20\x86" />	18	<file src="..\..\build\$configuration$\v141\x86\mbanative.dll" target="build\net20\x86" />
19	<file src="..\..\build\$configuration$\$id$.dll" target="lib\net20" />	19	<file src="..\..\build\$configuration$\$id$.dll" target="lib\net20" />
20	</files>	20	</files>
21	</package>	21	</package>


diff --git a/src/balutil/balutil.nuspec b/src/balutil/balutil.nuspec index 0a26004a..e82610e3 100644 --- a/src/balutil/balutil.nuspec +++ b/src/balutil/balutil.nuspec
@@ -20,7 +20,7 @@
20	<files>	20	<files>
21	<file src="build\$id$.props" target="build\" />	21	<file src="build\$id$.props" target="build\" />
22	<file src="inc\*" target="build\native\include" />	22	<file src="inc\*" target="build\native\include" />
23	<file src="..\..\build\$configuration$\v140_xp\x86\balutil.lib" target="build\native\v140\x86" />	23	<file src="..\..\build\$configuration$\v140\x86\balutil.lib" target="build\native\v140\x86" />
24	<file src="..\..\build\$configuration$\v141_xp\x86\balutil.lib" target="build\native\v141\x86" />	24	<file src="..\..\build\$configuration$\v141\x86\balutil.lib" target="build\native\v141\x86" />
25	</files>	25	</files>
26	</package>	26	</package>


diff --git a/src/balutil/balutil.vcxproj b/src/balutil/balutil.vcxproj index 8c96c002..f37fde17 100644 --- a/src/balutil/balutil.vcxproj +++ b/src/balutil/balutil.vcxproj
@@ -2,8 +2,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		3
4	<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">	4	<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
5	<Import Project="..\..\packages\WixToolset.BootstrapperCore.Native.4.0.15\build\WixToolset.BootstrapperCore.Native.props" Condition="Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.15\build\WixToolset.BootstrapperCore.Native.props')" />	5	<Import Project="..\..\packages\WixToolset.BootstrapperCore.Native.4.0.16\build\WixToolset.BootstrapperCore.Native.props" Condition="Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.16\build\WixToolset.BootstrapperCore.Native.props')" />
6	<Import Project="..\..\packages\WixToolset.DUtil.4.0.18\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.18\build\WixToolset.DUtil.props')" />	6	<Import Project="..\..\packages\WixToolset.DUtil.4.0.22\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.22\build\WixToolset.DUtil.props')" />
7		7
8	<ItemGroup Label="ProjectConfigurations">	8	<ItemGroup Label="ProjectConfigurations">
9	<ProjectConfiguration Include="Debug\|Win32">	9	<ProjectConfiguration Include="Debug\|Win32">
@@ -90,8 +90,8 @@
90	<PropertyGroup>	90	<PropertyGroup>
91	<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>	91	<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
92	</PropertyGroup>	92	</PropertyGroup>
93	<Error Condition="!Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.15\build\WixToolset.BootstrapperCore.Native.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.BootstrapperCore.Native.4.0.15\build\WixToolset.BootstrapperCore.Native.props'))" />	93	<Error Condition="!Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.16\build\WixToolset.BootstrapperCore.Native.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.BootstrapperCore.Native.4.0.16\build\WixToolset.BootstrapperCore.Native.props'))" />
94	<Error Condition="!Exists('..\..\packages\WixToolset.DUtil.4.0.18\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.DUtil.4.0.18\build\WixToolset.DUtil.props'))" />	94	<Error Condition="!Exists('..\..\packages\WixToolset.DUtil.4.0.22\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.DUtil.4.0.22\build\WixToolset.DUtil.props'))" />
95	<Error Condition="!Exists('..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets'))" />	95	<Error Condition="!Exists('..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets'))" />
96	</Target>	96	</Target>
97	</Project>	97	</Project>


diff --git a/src/balutil/packages.config b/src/balutil/packages.config index e9b2d190..7fb53719 100644 --- a/src/balutil/packages.config +++ b/src/balutil/packages.config
@@ -1,6 +1,6 @@
1	<?xml version="1.0" encoding="utf-8"?>	1	<?xml version="1.0" encoding="utf-8"?>
2	<packages>	2	<packages>
3	<package id="Nerdbank.GitVersioning" version="2.1.65" targetFramework="native" developmentDependency="true" />	3	<package id="Nerdbank.GitVersioning" version="2.1.65" targetFramework="native" developmentDependency="true" />
4	<package id="WixToolset.BootstrapperCore.Native" version="4.0.15" targetFramework="native" />	4	<package id="WixToolset.BootstrapperCore.Native" version="4.0.16" targetFramework="native" />
5	<package id="WixToolset.DUtil" version="4.0.18" targetFramework="native" />	5	<package id="WixToolset.DUtil" version="4.0.22" targetFramework="native" />
6	</packages> \ No newline at end of file	6	</packages> \ No newline at end of file


diff --git a/src/bextutil/bextutil.nuspec b/src/bextutil/bextutil.nuspec index 30e0871d..40488610 100644 --- a/src/bextutil/bextutil.nuspec +++ b/src/bextutil/bextutil.nuspec
@@ -20,7 +20,7 @@
20	<files>	20	<files>
21	<file src="build\$id$.props" target="build\" />	21	<file src="build\$id$.props" target="build\" />
22	<file src="inc\*" target="build\native\include" />	22	<file src="inc\*" target="build\native\include" />
23	<file src="..\..\build\$configuration$\v140_xp\x86\bextutil.lib" target="build\native\v140\x86" />	23	<file src="..\..\build\$configuration$\v140\x86\bextutil.lib" target="build\native\v140\x86" />
24	<file src="..\..\build\$configuration$\v141_xp\x86\bextutil.lib" target="build\native\v141\x86" />	24	<file src="..\..\build\$configuration$\v141\x86\bextutil.lib" target="build\native\v141\x86" />
25	</files>	25	</files>
26	</package>	26	</package>


diff --git a/src/bextutil/bextutil.vcxproj b/src/bextutil/bextutil.vcxproj index eb552747..50c6c7d2 100644 --- a/src/bextutil/bextutil.vcxproj +++ b/src/bextutil/bextutil.vcxproj
@@ -2,8 +2,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		3
4	<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">	4	<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
5	<Import Project="..\..\packages\WixToolset.BootstrapperCore.Native.4.0.15\build\WixToolset.BootstrapperCore.Native.props" Condition="Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.15\build\WixToolset.BootstrapperCore.Native.props')" />	5	<Import Project="..\..\packages\WixToolset.BootstrapperCore.Native.4.0.16\build\WixToolset.BootstrapperCore.Native.props" Condition="Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.16\build\WixToolset.BootstrapperCore.Native.props')" />
6	<Import Project="..\..\packages\WixToolset.DUtil.4.0.18\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.18\build\WixToolset.DUtil.props')" />	6	<Import Project="..\..\packages\WixToolset.DUtil.4.0.22\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.22\build\WixToolset.DUtil.props')" />
7		7
8	<ItemGroup Label="ProjectConfigurations">	8	<ItemGroup Label="ProjectConfigurations">
9	<ProjectConfiguration Include="Debug\|Win32">	9	<ProjectConfiguration Include="Debug\|Win32">
@@ -79,8 +79,8 @@
79	<PropertyGroup>	79	<PropertyGroup>
80	<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>	80	<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
81	</PropertyGroup>	81	</PropertyGroup>
82	<Error Condition="!Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.15\build\WixToolset.BootstrapperCore.Native.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.BootstrapperCore.Native.4.0.15\build\WixToolset.BootstrapperCore.Native.props'))" />	82	<Error Condition="!Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.16\build\WixToolset.BootstrapperCore.Native.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.BootstrapperCore.Native.4.0.16\build\WixToolset.BootstrapperCore.Native.props'))" />
83	<Error Condition="!Exists('..\..\packages\WixToolset.DUtil.4.0.18\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.DUtil.4.0.18\build\WixToolset.DUtil.props'))" />	83	<Error Condition="!Exists('..\..\packages\WixToolset.DUtil.4.0.22\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.DUtil.4.0.22\build\WixToolset.DUtil.props'))" />
84	<Error Condition="!Exists('..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets'))" />	84	<Error Condition="!Exists('..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets'))" />
85	</Target>	85	</Target>
86	</Project>	86	</Project>


diff --git a/src/bextutil/packages.config b/src/bextutil/packages.config index e9b2d190..7fb53719 100644 --- a/src/bextutil/packages.config +++ b/src/bextutil/packages.config
@@ -1,6 +1,6 @@
1	<?xml version="1.0" encoding="utf-8"?>	1	<?xml version="1.0" encoding="utf-8"?>
2	<packages>	2	<packages>
3	<package id="Nerdbank.GitVersioning" version="2.1.65" targetFramework="native" developmentDependency="true" />	3	<package id="Nerdbank.GitVersioning" version="2.1.65" targetFramework="native" developmentDependency="true" />
4	<package id="WixToolset.BootstrapperCore.Native" version="4.0.15" targetFramework="native" />	4	<package id="WixToolset.BootstrapperCore.Native" version="4.0.16" targetFramework="native" />
5	<package id="WixToolset.DUtil" version="4.0.18" targetFramework="native" />	5	<package id="WixToolset.DUtil" version="4.0.22" targetFramework="native" />
6	</packages> \ No newline at end of file	6	</packages> \ No newline at end of file


diff --git a/src/mbanative/mbanative.vcxproj b/src/mbanative/mbanative.vcxproj index 0cba46b5..5a998182 100644 --- a/src/mbanative/mbanative.vcxproj +++ b/src/mbanative/mbanative.vcxproj
@@ -2,8 +2,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		3
4	<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">	4	<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
5	<Import Project="..\..\packages\WixToolset.BootstrapperCore.Native.4.0.15\build\WixToolset.BootstrapperCore.Native.props" Condition="Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.15\build\WixToolset.BootstrapperCore.Native.props')" />	5	<Import Project="..\..\packages\WixToolset.BootstrapperCore.Native.4.0.16\build\WixToolset.BootstrapperCore.Native.props" Condition="Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.16\build\WixToolset.BootstrapperCore.Native.props')" />
6	<Import Project="..\..\packages\WixToolset.DUtil.4.0.18\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.18\build\WixToolset.DUtil.props')" />	6	<Import Project="..\..\packages\WixToolset.DUtil.4.0.22\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.22\build\WixToolset.DUtil.props')" />
7		7
8	<ItemGroup Label="ProjectConfigurations">	8	<ItemGroup Label="ProjectConfigurations">
9	<ProjectConfiguration Include="Debug\|Win32">	9	<ProjectConfiguration Include="Debug\|Win32">
@@ -69,8 +69,8 @@
69	<PropertyGroup>	69	<PropertyGroup>
70	<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>	70	<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
71	</PropertyGroup>	71	</PropertyGroup>
72	<Error Condition="!Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.15\build\WixToolset.BootstrapperCore.Native.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.BootstrapperCore.Native.4.0.15\build\WixToolset.BootstrapperCore.Native.props'))" />	72	<Error Condition="!Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.16\build\WixToolset.BootstrapperCore.Native.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.BootstrapperCore.Native.4.0.16\build\WixToolset.BootstrapperCore.Native.props'))" />
73	<Error Condition="!Exists('..\..\packages\WixToolset.DUtil.4.0.18\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.DUtil.4.0.18\build\WixToolset.DUtil.props'))" />	73	<Error Condition="!Exists('..\..\packages\WixToolset.DUtil.4.0.22\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.DUtil.4.0.22\build\WixToolset.DUtil.props'))" />
74	<Error Condition="!Exists('..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets'))" />	74	<Error Condition="!Exists('..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets'))" />
75	</Target>	75	</Target>
76	</Project>	76	</Project>


diff --git a/src/mbanative/packages.config b/src/mbanative/packages.config index e9b2d190..7fb53719 100644 --- a/src/mbanative/packages.config +++ b/src/mbanative/packages.config
@@ -1,6 +1,6 @@
1	<?xml version="1.0" encoding="utf-8"?>	1	<?xml version="1.0" encoding="utf-8"?>
2	<packages>	2	<packages>
3	<package id="Nerdbank.GitVersioning" version="2.1.65" targetFramework="native" developmentDependency="true" />	3	<package id="Nerdbank.GitVersioning" version="2.1.65" targetFramework="native" developmentDependency="true" />
4	<package id="WixToolset.BootstrapperCore.Native" version="4.0.15" targetFramework="native" />	4	<package id="WixToolset.BootstrapperCore.Native" version="4.0.16" targetFramework="native" />
5	<package id="WixToolset.DUtil" version="4.0.18" targetFramework="native" />	5	<package id="WixToolset.DUtil" version="4.0.22" targetFramework="native" />
6	</packages> \ No newline at end of file	6	</packages> \ No newline at end of file


diff --git a/src/test/WixToolsetTest.Mba.Core/WixToolsetTest.Mba.Core.csproj b/src/test/WixToolsetTest.Mba.Core/WixToolsetTest.Mba.Core.csproj index d401d877..9959e261 100644 --- a/src/test/WixToolsetTest.Mba.Core/WixToolsetTest.Mba.Core.csproj +++ b/src/test/WixToolsetTest.Mba.Core/WixToolsetTest.Mba.Core.csproj
@@ -3,7 +3,7 @@
3		3
4	<Project Sdk="Microsoft.NET.Sdk">	4	<Project Sdk="Microsoft.NET.Sdk">
5	<PropertyGroup>	5	<PropertyGroup>
6	<TargetFramework>netcoreapp2.1</TargetFramework>	6	<TargetFramework>netcoreapp3.1</TargetFramework>
7	<IsPackable>false</IsPackable>	7	<IsPackable>false</IsPackable>
8	<Platforms>AnyCPU;x86;x64</Platforms>	8	<Platforms>AnyCPU;x86;x64</Platforms>
9	</PropertyGroup>	9	</PropertyGroup>
@@ -22,7 +22,7 @@
22	</ItemGroup>	22	</ItemGroup>
23		23
24	<ItemGroup>	24	<ItemGroup>
25	<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0" />	25	<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.3.0" />
26	<PackageReference Include="xunit" Version="2.4.1" />	26	<PackageReference Include="xunit" Version="2.4.1" />
27	<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" PrivateAssets="All" />	27	<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" PrivateAssets="All" />
28	</ItemGroup>	28	</ItemGroup>