Update dependencies

...and skip now-broken DotNetCoreSdk Heat test
author: Bob Arnson <bob@firegiant.com> 2020-11-17 18:59:51 -0500
committer: Bob Arnson <bob@firegiant.com> 2020-11-17 19:58:16 -0500
commit: 50f38d69001b2eb457a4603e14c98d05e28c3a5d (patch)
tree: 88ff20248c5b2c22958d45b1e49fe7e6a88477e0
parent: 4c5ad8eff847ae894bbb91a50335fe7982e0ead2 (diff)
download: wix-50f38d69001b2eb457a4603e14c98d05e28c3a5d.tar.gz
wix-50f38d69001b2eb457a4603e14c98d05e28c3a5d.tar.bz2
wix-50f38d69001b2eb457a4603e14c98d05e28c3a5d.zip
11 files changed, 13 insertions, 13 deletions
diff --git a/src/ThmViewerPackage/ThmViewerPackage.wixproj b/src/ThmViewerPackage/ThmViewerPackage.wixproj
index fefd6949..23d24654 100644
--- a/src/ThmViewerPackage/ThmViewerPackage.wixproj
+++ b/src/ThmViewerPackage/ThmViewerPackage.wixproj
@@ -29,7 +29,7 @@
    <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\Nerdbank.GitVersioning.3.1.91\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Nerdbank.GitVersioning.3.1.91\build\Nerdbank.GitVersioning.targets'))" />
+    <Error Condition="!Exists('..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets'))" />
  </Target>
-  <Import Project="..\..\packages\Nerdbank.GitVersioning.3.1.91\build\Nerdbank.GitVersioning.targets" Condition="Exists('..\..\packages\Nerdbank.GitVersioning.3.1.91\build\Nerdbank.GitVersioning.targets')" />
+  <Import Project="..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets" Condition="Exists('..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets')" />
 </Project>
diff --git a/src/ThmViewerPackage/packages.config b/src/ThmViewerPackage/packages.config
index 9b93a067..7e55f706 100644
--- a/src/ThmViewerPackage/packages.config
+++ b/src/ThmViewerPackage/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Nerdbank.GitVersioning" version="3.1.91" developmentDependency="true" targetFramework="net40" />
+  <package id="Nerdbank.GitVersioning" version="3.3.37" developmentDependency="true" targetFramework="net40" />
 </packages>
 \ No newline at end of file
diff --git a/src/WixToolset.BuildTasks/WixToolset.BuildTasks.csproj b/src/WixToolset.BuildTasks/WixToolset.BuildTasks.csproj
index c006b5a4..196b0916 100644
--- a/src/WixToolset.BuildTasks/WixToolset.BuildTasks.csproj
+++ b/src/WixToolset.BuildTasks/WixToolset.BuildTasks.csproj
@@ -37,6 +37,6 @@
  <ItemGroup>
    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
-    <PackageReference Include="Nerdbank.GitVersioning" Version="3.1.91" PrivateAssets="All" />
+    <PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" PrivateAssets="All" />
  </ItemGroup>
 </Project>
diff --git a/src/WixToolset.Core.InternalPackage/WixToolset.Core.InternalPackage.csproj b/src/WixToolset.Core.InternalPackage/WixToolset.Core.InternalPackage.csproj
index 24d5decc..122734ed 100644
--- a/src/WixToolset.Core.InternalPackage/WixToolset.Core.InternalPackage.csproj
+++ b/src/WixToolset.Core.InternalPackage/WixToolset.Core.InternalPackage.csproj
@@ -12,7 +12,7 @@
  </PropertyGroup>
  <ItemGroup>
-    <PackageReference Include="Nerdbank.GitVersioning" Version="3.1.91" PrivateAssets="all" />
+    <PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" PrivateAssets="all" />
  </ItemGroup>
  <PropertyGroup>
diff --git a/src/WixToolset.Sdk/WixToolset.Sdk.csproj b/src/WixToolset.Sdk/WixToolset.Sdk.csproj
index f1f063d5..041cccc8 100644
--- a/src/WixToolset.Sdk/WixToolset.Sdk.csproj
+++ b/src/WixToolset.Sdk/WixToolset.Sdk.csproj
@@ -22,7 +22,7 @@
  </ItemGroup>
  <ItemGroup>
-    <PackageReference Include="Nerdbank.GitVersioning" Version="3.1.91" PrivateAssets="All" />
+    <PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" PrivateAssets="All" />
  </ItemGroup>
  <PropertyGroup>
diff --git a/src/dotnet-wix/dotnet-wix.csproj b/src/dotnet-wix/dotnet-wix.csproj
index 0f42d0be..4cb9ba54 100644
--- a/src/dotnet-wix/dotnet-wix.csproj
+++ b/src/dotnet-wix/dotnet-wix.csproj
@@ -12,7 +12,7 @@
  </PropertyGroup>
  <ItemGroup>
-    <PackageReference Include="Nerdbank.GitVersioning" Version="3.1.91" PrivateAssets="All" />
+    <PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" PrivateAssets="All" />
  </ItemGroup>
  <PropertyGroup>
diff --git a/src/heat/heat.csproj b/src/heat/heat.csproj
index 51c9b297..b82087df 100644
--- a/src/heat/heat.csproj
+++ b/src/heat/heat.csproj
@@ -35,6 +35,6 @@
  <ItemGroup>
    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
-    <PackageReference Include="Nerdbank.GitVersioning" Version="3.1.91" PrivateAssets="All" />
+    <PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" PrivateAssets="All" />
  </ItemGroup>
 </Project>
diff --git a/src/test/WixToolsetTest.Sdk/MsbuildHeatFixture.cs b/src/test/WixToolsetTest.Sdk/MsbuildHeatFixture.cs
index 10840c56..bbf151eb 100644
--- a/src/test/WixToolsetTest.Sdk/MsbuildHeatFixture.cs
+++ b/src/test/WixToolsetTest.Sdk/MsbuildHeatFixture.cs
@@ -257,7 +257,7 @@ namespace WixToolsetTest.Sdk
            }
        }
-        [Theory]
+        [Theory(Skip = "DotNetCoreSdk builds fail in 16.8.1")]
        [InlineData(BuildSystem.DotNetCoreSdk, true)]
        [InlineData(BuildSystem.DotNetCoreSdk, false)]
        [InlineData(BuildSystem.MSBuild, true)]
diff --git a/src/thmviewer/packages.config b/src/thmviewer/packages.config
index 321d628a..28ff6ebd 100644
--- a/src/thmviewer/packages.config
+++ b/src/thmviewer/packages.config
@@ -3,6 +3,6 @@
  <package id="Microsoft.Build.Tasks.Git" version="1.0.0" targetFramework="native" developmentDependency="true" />
  <package id="Microsoft.SourceLink.Common" version="1.0.0" targetFramework="native" developmentDependency="true" />
  <package id="Microsoft.SourceLink.GitHub" version="1.0.0" targetFramework="native" developmentDependency="true" />
-  <package id="Nerdbank.GitVersioning" version="3.1.91" targetFramework="native" developmentDependency="true" />
+  <package id="Nerdbank.GitVersioning" version="3.3.37" targetFramework="native" developmentDependency="true" />
  <package id="WixToolset.DUtil" version="4.0.41" targetFramework="native" />
 </packages>
 \ No newline at end of file
diff --git a/src/thmviewer/thmviewer.vcxproj b/src/thmviewer/thmviewer.vcxproj
index 157b3949..65c00614 100644
--- a/src/thmviewer/thmviewer.vcxproj
+++ b/src/thmviewer/thmviewer.vcxproj
@@ -69,7 +69,7 @@
    <Import Project="..\..\packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.targets" Condition="Exists('..\..\packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.targets')" />
    <Import Project="..\..\packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.targets" Condition="Exists('..\..\packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.targets')" />
    <Import Project="..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.targets" Condition="Exists('..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.targets')" />
-    <Import Project="..\..\packages\Nerdbank.GitVersioning.3.1.91\build\Nerdbank.GitVersioning.targets" Condition="Exists('..\..\packages\Nerdbank.GitVersioning.3.1.91\build\Nerdbank.GitVersioning.targets')" />
+    <Import Project="..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets" Condition="Exists('..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets')" />
  </ImportGroup>
  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
@@ -82,7 +82,7 @@
    <Error Condition="!Exists('..\..\packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.targets'))" />
    <Error Condition="!Exists('..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.props'))" />
    <Error Condition="!Exists('..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.targets'))" />
-    <Error Condition="!Exists('..\..\packages\Nerdbank.GitVersioning.3.1.91\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Nerdbank.GitVersioning.3.1.91\build\Nerdbank.GitVersioning.targets'))" />
+    <Error Condition="!Exists('..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets'))" />
    <Error Condition="!Exists('..\..\packages\WixToolset.DUtil.4.0.41\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.DUtil.4.0.41\build\WixToolset.DUtil.props'))" />
  </Target>
 </Project>
 \ No newline at end of file
diff --git a/src/wix/wix.csproj b/src/wix/wix.csproj
index d03d076e..0552c28a 100644
--- a/src/wix/wix.csproj
+++ b/src/wix/wix.csproj
@@ -33,6 +33,6 @@
  <ItemGroup>
    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
-    <PackageReference Include="Nerdbank.GitVersioning" Version="3.1.91" PrivateAssets="All" />
+    <PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" PrivateAssets="All" />
  </ItemGroup>
 </Project>
author	Bob Arnson <bob@firegiant.com>	2020-11-17 18:59:51 -0500
committer	Bob Arnson <bob@firegiant.com>	2020-11-17 19:58:16 -0500
commit	50f38d69001b2eb457a4603e14c98d05e28c3a5d (patch)
tree	88ff20248c5b2c22958d45b1e49fe7e6a88477e0
parent	4c5ad8eff847ae894bbb91a50335fe7982e0ead2 (diff)
download	wix-50f38d69001b2eb457a4603e14c98d05e28c3a5d.tar.gz wix-50f38d69001b2eb457a4603e14c98d05e28c3a5d.tar.bz2 wix-50f38d69001b2eb457a4603e14c98d05e28c3a5d.zip

diff --git a/src/ThmViewerPackage/ThmViewerPackage.wixproj b/src/ThmViewerPackage/ThmViewerPackage.wixproj index fefd6949..23d24654 100644 --- a/src/ThmViewerPackage/ThmViewerPackage.wixproj +++ b/src/ThmViewerPackage/ThmViewerPackage.wixproj
@@ -29,7 +29,7 @@
29	<PropertyGroup>	29	<PropertyGroup>
30	<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>	30	<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>
31	</PropertyGroup>	31	</PropertyGroup>
32	<Error Condition="!Exists('..\..\packages\Nerdbank.GitVersioning.3.1.91\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Nerdbank.GitVersioning.3.1.91\build\Nerdbank.GitVersioning.targets'))" />	32	<Error Condition="!Exists('..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets'))" />
33	</Target>	33	</Target>
34	<Import Project="..\..\packages\Nerdbank.GitVersioning.3.1.91\build\Nerdbank.GitVersioning.targets" Condition="Exists('..\..\packages\Nerdbank.GitVersioning.3.1.91\build\Nerdbank.GitVersioning.targets')" />	34	<Import Project="..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets" Condition="Exists('..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets')" />
35	</Project>	35	</Project>


diff --git a/src/ThmViewerPackage/packages.config b/src/ThmViewerPackage/packages.config index 9b93a067..7e55f706 100644 --- a/src/ThmViewerPackage/packages.config +++ b/src/ThmViewerPackage/packages.config
@@ -1,4 +1,4 @@
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="3.1.91" developmentDependency="true" targetFramework="net40" />	3	<package id="Nerdbank.GitVersioning" version="3.3.37" developmentDependency="true" targetFramework="net40" />
4	</packages> \ No newline at end of file	4	</packages> \ No newline at end of file


diff --git a/src/WixToolset.BuildTasks/WixToolset.BuildTasks.csproj b/src/WixToolset.BuildTasks/WixToolset.BuildTasks.csproj index c006b5a4..196b0916 100644 --- a/src/WixToolset.BuildTasks/WixToolset.BuildTasks.csproj +++ b/src/WixToolset.BuildTasks/WixToolset.BuildTasks.csproj
@@ -37,6 +37,6 @@
37		37
38	<ItemGroup>	38	<ItemGroup>
39	<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />	39	<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
40	<PackageReference Include="Nerdbank.GitVersioning" Version="3.1.91" PrivateAssets="All" />	40	<PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" PrivateAssets="All" />
41	</ItemGroup>	41	</ItemGroup>
42	</Project>	42	</Project>


diff --git a/src/WixToolset.Core.InternalPackage/WixToolset.Core.InternalPackage.csproj b/src/WixToolset.Core.InternalPackage/WixToolset.Core.InternalPackage.csproj index 24d5decc..122734ed 100644 --- a/src/WixToolset.Core.InternalPackage/WixToolset.Core.InternalPackage.csproj +++ b/src/WixToolset.Core.InternalPackage/WixToolset.Core.InternalPackage.csproj
@@ -12,7 +12,7 @@
12	</PropertyGroup>	12	</PropertyGroup>
13		13
14	<ItemGroup>	14	<ItemGroup>
15	<PackageReference Include="Nerdbank.GitVersioning" Version="3.1.91" PrivateAssets="all" />	15	<PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" PrivateAssets="all" />
16	</ItemGroup>	16	</ItemGroup>
17		17
18	<PropertyGroup>	18	<PropertyGroup>


diff --git a/src/WixToolset.Sdk/WixToolset.Sdk.csproj b/src/WixToolset.Sdk/WixToolset.Sdk.csproj index f1f063d5..041cccc8 100644 --- a/src/WixToolset.Sdk/WixToolset.Sdk.csproj +++ b/src/WixToolset.Sdk/WixToolset.Sdk.csproj
@@ -22,7 +22,7 @@
22	</ItemGroup>	22	</ItemGroup>
23		23
24	<ItemGroup>	24	<ItemGroup>
25	<PackageReference Include="Nerdbank.GitVersioning" Version="3.1.91" PrivateAssets="All" />	25	<PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" PrivateAssets="All" />
26	</ItemGroup>	26	</ItemGroup>
27		27
28	<PropertyGroup>	28	<PropertyGroup>


diff --git a/src/dotnet-wix/dotnet-wix.csproj b/src/dotnet-wix/dotnet-wix.csproj index 0f42d0be..4cb9ba54 100644 --- a/src/dotnet-wix/dotnet-wix.csproj +++ b/src/dotnet-wix/dotnet-wix.csproj
@@ -12,7 +12,7 @@
12	</PropertyGroup>	12	</PropertyGroup>
13		13
14	<ItemGroup>	14	<ItemGroup>
15	<PackageReference Include="Nerdbank.GitVersioning" Version="3.1.91" PrivateAssets="All" />	15	<PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" PrivateAssets="All" />
16	</ItemGroup>	16	</ItemGroup>
17		17
18	<PropertyGroup>	18	<PropertyGroup>


diff --git a/src/heat/heat.csproj b/src/heat/heat.csproj index 51c9b297..b82087df 100644 --- a/src/heat/heat.csproj +++ b/src/heat/heat.csproj
@@ -35,6 +35,6 @@
35		35
36	<ItemGroup>	36	<ItemGroup>
37	<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />	37	<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
38	<PackageReference Include="Nerdbank.GitVersioning" Version="3.1.91" PrivateAssets="All" />	38	<PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" PrivateAssets="All" />
39	</ItemGroup>	39	</ItemGroup>
40	</Project>	40	</Project>


diff --git a/src/test/WixToolsetTest.Sdk/MsbuildHeatFixture.cs b/src/test/WixToolsetTest.Sdk/MsbuildHeatFixture.cs index 10840c56..bbf151eb 100644 --- a/src/test/WixToolsetTest.Sdk/MsbuildHeatFixture.cs +++ b/src/test/WixToolsetTest.Sdk/MsbuildHeatFixture.cs
@@ -257,7 +257,7 @@ namespace WixToolsetTest.Sdk
257	}	257	}
258	}	258	}
259		259
260	[Theory]	260	[Theory(Skip = "DotNetCoreSdk builds fail in 16.8.1")]
261	[InlineData(BuildSystem.DotNetCoreSdk, true)]	261	[InlineData(BuildSystem.DotNetCoreSdk, true)]
262	[InlineData(BuildSystem.DotNetCoreSdk, false)]	262	[InlineData(BuildSystem.DotNetCoreSdk, false)]
263	[InlineData(BuildSystem.MSBuild, true)]	263	[InlineData(BuildSystem.MSBuild, true)]


diff --git a/src/thmviewer/packages.config b/src/thmviewer/packages.config index 321d628a..28ff6ebd 100644 --- a/src/thmviewer/packages.config +++ b/src/thmviewer/packages.config
@@ -3,6 +3,6 @@
3	<package id="Microsoft.Build.Tasks.Git" version="1.0.0" targetFramework="native" developmentDependency="true" />	3	<package id="Microsoft.Build.Tasks.Git" version="1.0.0" targetFramework="native" developmentDependency="true" />
4	<package id="Microsoft.SourceLink.Common" version="1.0.0" targetFramework="native" developmentDependency="true" />	4	<package id="Microsoft.SourceLink.Common" version="1.0.0" targetFramework="native" developmentDependency="true" />
5	<package id="Microsoft.SourceLink.GitHub" version="1.0.0" targetFramework="native" developmentDependency="true" />	5	<package id="Microsoft.SourceLink.GitHub" version="1.0.0" targetFramework="native" developmentDependency="true" />
6	<package id="Nerdbank.GitVersioning" version="3.1.91" targetFramework="native" developmentDependency="true" />	6	<package id="Nerdbank.GitVersioning" version="3.3.37" targetFramework="native" developmentDependency="true" />
7	<package id="WixToolset.DUtil" version="4.0.41" targetFramework="native" />	7	<package id="WixToolset.DUtil" version="4.0.41" targetFramework="native" />
8	</packages> \ No newline at end of file	8	</packages> \ No newline at end of file


diff --git a/src/thmviewer/thmviewer.vcxproj b/src/thmviewer/thmviewer.vcxproj index 157b3949..65c00614 100644 --- a/src/thmviewer/thmviewer.vcxproj +++ b/src/thmviewer/thmviewer.vcxproj
@@ -69,7 +69,7 @@
69	<Import Project="..\..\packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.targets" Condition="Exists('..\..\packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.targets')" />	69	<Import Project="..\..\packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.targets" Condition="Exists('..\..\packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.targets')" />
70	<Import Project="..\..\packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.targets" Condition="Exists('..\..\packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.targets')" />	70	<Import Project="..\..\packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.targets" Condition="Exists('..\..\packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.targets')" />
71	<Import Project="..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.targets" Condition="Exists('..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.targets')" />	71	<Import Project="..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.targets" Condition="Exists('..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.targets')" />
72	<Import Project="..\..\packages\Nerdbank.GitVersioning.3.1.91\build\Nerdbank.GitVersioning.targets" Condition="Exists('..\..\packages\Nerdbank.GitVersioning.3.1.91\build\Nerdbank.GitVersioning.targets')" />	72	<Import Project="..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets" Condition="Exists('..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets')" />
73	</ImportGroup>	73	</ImportGroup>
74		74
75	<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">	75	<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
@@ -82,7 +82,7 @@
82	<Error Condition="!Exists('..\..\packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.targets'))" />	82	<Error Condition="!Exists('..\..\packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.targets'))" />
83	<Error Condition="!Exists('..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.props'))" />	83	<Error Condition="!Exists('..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.props'))" />
84	<Error Condition="!Exists('..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.targets'))" />	84	<Error Condition="!Exists('..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.targets'))" />
85	<Error Condition="!Exists('..\..\packages\Nerdbank.GitVersioning.3.1.91\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Nerdbank.GitVersioning.3.1.91\build\Nerdbank.GitVersioning.targets'))" />	85	<Error Condition="!Exists('..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets'))" />
86	<Error Condition="!Exists('..\..\packages\WixToolset.DUtil.4.0.41\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.DUtil.4.0.41\build\WixToolset.DUtil.props'))" />	86	<Error Condition="!Exists('..\..\packages\WixToolset.DUtil.4.0.41\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.DUtil.4.0.41\build\WixToolset.DUtil.props'))" />
87	</Target>	87	</Target>
88	</Project> \ No newline at end of file	88	</Project> \ No newline at end of file


diff --git a/src/wix/wix.csproj b/src/wix/wix.csproj index d03d076e..0552c28a 100644 --- a/src/wix/wix.csproj +++ b/src/wix/wix.csproj
@@ -33,6 +33,6 @@
33		33
34	<ItemGroup>	34	<ItemGroup>
35	<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />	35	<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
36	<PackageReference Include="Nerdbank.GitVersioning" Version="3.1.91" PrivateAssets="All" />	36	<PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" PrivateAssets="All" />
37	</ItemGroup>	37	</ItemGroup>
38	</Project>	38	</Project>