From a5fe70f726e8f428306ccba54037ce2ba055b1f8 Mon Sep 17 00:00:00 2001
From: Sean Hall <r.sean.hall@gmail.com>
Date: Tue, 2 Mar 2021 19:03:25 -0600
Subject: Update dependencies and integrate changes. Remove unsupported
 versions of .NET Framework. Update to latest 3.1 .NET Core. Remove
 /ChainingPackage from .NET Framework args. Remove RepairArguments from .NET
 Framework packages. Make all package urls https.

#3992, #4183, #5374, #5615, #5762
---
 src/ca/netfxca.vcxproj | 4 ++--
 src/ca/packages.config | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/ca')

diff --git a/src/ca/netfxca.vcxproj b/src/ca/netfxca.vcxproj
index d03637c7..2f91eba3 100644
--- a/src/ca/netfxca.vcxproj
+++ b/src/ca/netfxca.vcxproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-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.DUtil.4.0.62\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.62\build\WixToolset.DUtil.props')" />
+  <Import Project="..\..\packages\WixToolset.DUtil.4.0.64\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.64\build\WixToolset.DUtil.props')" />
   <Import Project="..\..\packages\WixToolset.WcaUtil.4.0.18\build\WixToolset.WcaUtil.props" Condition="Exists('..\..\packages\WixToolset.WcaUtil.4.0.18\build\WixToolset.WcaUtil.props')" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
@@ -62,7 +62,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\WixToolset.DUtil.4.0.62\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.DUtil.4.0.62\build\WixToolset.DUtil.props'))" />
+    <Error Condition="!Exists('..\..\packages\WixToolset.DUtil.4.0.64\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.DUtil.4.0.64\build\WixToolset.DUtil.props'))" />
     <Error Condition="!Exists('..\..\packages\WixToolset.WcaUtil.4.0.18\build\WixToolset.WcaUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.WcaUtil.4.0.18\build\WixToolset.WcaUtil.props'))" />
   </Target>
 </Project>
\ No newline at end of file
diff --git a/src/ca/packages.config b/src/ca/packages.config
index f5039303..8a6eee87 100644
--- a/src/ca/packages.config
+++ b/src/ca/packages.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="WixToolset.DUtil" version="4.0.62" targetFramework="native" />
+  <package id="WixToolset.DUtil" version="4.0.64" targetFramework="native" />
   <package id="WixToolset.WcaUtil" version="4.0.18" targetFramework="native" />
 </packages>
\ No newline at end of file
-- 
cgit v1.2.3-55-g6feb