diff options
| author | Sean Hall <r.sean.hall@gmail.com> | 2021-03-02 19:03:25 -0600 |
|---|---|---|
| committer | Sean Hall <r.sean.hall@gmail.com> | 2021-03-02 19:07:57 -0600 |
| commit | a5fe70f726e8f428306ccba54037ce2ba055b1f8 (patch) | |
| tree | 0ada20f6c7ecc2a1e8c1b8d0808b541fb92359ea /src/ca | |
| parent | 856e76f63fe19c21a3f0f91b7d04552901b4f733 (diff) | |
| download | wix-a5fe70f726e8f428306ccba54037ce2ba055b1f8.tar.gz wix-a5fe70f726e8f428306ccba54037ce2ba055b1f8.tar.bz2 wix-a5fe70f726e8f428306ccba54037ce2ba055b1f8.zip | |
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
Diffstat (limited to 'src/ca')
| -rw-r--r-- | src/ca/netfxca.vcxproj | 4 | ||||
| -rw-r--r-- | src/ca/packages.config | 2 |
2 files changed, 3 insertions, 3 deletions
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 @@ | |||
| 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" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | 3 | <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> |
| 4 | <Import Project="..\..\packages\WixToolset.DUtil.4.0.62\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.62\build\WixToolset.DUtil.props')" /> | 4 | <Import Project="..\..\packages\WixToolset.DUtil.4.0.64\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.64\build\WixToolset.DUtil.props')" /> |
| 5 | <Import Project="..\..\packages\WixToolset.WcaUtil.4.0.18\build\WixToolset.WcaUtil.props" Condition="Exists('..\..\packages\WixToolset.WcaUtil.4.0.18\build\WixToolset.WcaUtil.props')" /> | 5 | <Import Project="..\..\packages\WixToolset.WcaUtil.4.0.18\build\WixToolset.WcaUtil.props" Condition="Exists('..\..\packages\WixToolset.WcaUtil.4.0.18\build\WixToolset.WcaUtil.props')" /> |
| 6 | <ItemGroup Label="ProjectConfigurations"> | 6 | <ItemGroup Label="ProjectConfigurations"> |
| 7 | <ProjectConfiguration Include="Debug|Win32"> | 7 | <ProjectConfiguration Include="Debug|Win32"> |
| @@ -62,7 +62,7 @@ | |||
| 62 | <PropertyGroup> | 62 | <PropertyGroup> |
| 63 | <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> | 63 | <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> |
| 64 | </PropertyGroup> | 64 | </PropertyGroup> |
| 65 | <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'))" /> | 65 | <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'))" /> |
| 66 | <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'))" /> | 66 | <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'))" /> |
| 67 | </Target> | 67 | </Target> |
| 68 | </Project> \ No newline at end of file | 68 | </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 @@ | |||
| 1 | <?xml version="1.0" encoding="utf-8"?> | 1 | <?xml version="1.0" encoding="utf-8"?> |
| 2 | <packages> | 2 | <packages> |
| 3 | <package id="WixToolset.DUtil" version="4.0.62" targetFramework="native" /> | 3 | <package id="WixToolset.DUtil" version="4.0.64" targetFramework="native" /> |
| 4 | <package id="WixToolset.WcaUtil" version="4.0.18" targetFramework="native" /> | 4 | <package id="WixToolset.WcaUtil" version="4.0.18" targetFramework="native" /> |
| 5 | </packages> \ No newline at end of file | 5 | </packages> \ No newline at end of file |