diff options
author | Sean Hall <r.sean.hall@gmail.com> | 2022-04-19 16:08:21 -0500 |
---|---|---|
committer | Sean Hall <r.sean.hall@gmail.com> | 2022-04-19 18:35:15 -0500 |
commit | 96ce05107d0e01014a3264e91ecb5731a9f28cc5 (patch) | |
tree | 29c1128c0b9b0db476cedc1d446c2269bfdecf62 /src/test/burn/WixToolset.WixBA | |
parent | 57fd164d56466a52854e825afd5fdc2b6b97f12a (diff) | |
download | wix-96ce05107d0e01014a3264e91ecb5731a9f28cc5.tar.gz wix-96ce05107d0e01014a3264e91ecb5731a9f28cc5.tar.bz2 wix-96ce05107d0e01014a3264e91ecb5731a9f28cc5.zip |
Upgrade test BAs to net6.0 and use x64 bundles for ManagedHost tests.
Fixes 6651
Diffstat (limited to 'src/test/burn/WixToolset.WixBA')
-rw-r--r-- | src/test/burn/WixToolset.WixBA/Model.cs | 2 | ||||
-rw-r--r-- | src/test/burn/WixToolset.WixBA/WixToolset.WixBA.csproj | 2 | ||||
-rw-r--r-- | src/test/burn/WixToolset.WixBA/WixToolset.WixBA_x64.csproj | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/src/test/burn/WixToolset.WixBA/Model.cs b/src/test/burn/WixToolset.WixBA/Model.cs index a557fa4e..5eaad8f3 100644 --- a/src/test/burn/WixToolset.WixBA/Model.cs +++ b/src/test/burn/WixToolset.WixBA/Model.cs | |||
@@ -113,7 +113,9 @@ namespace WixToolset.WixBA | |||
113 | /// <returns>Correctly configured HTTP web request.</returns> | 113 | /// <returns>Correctly configured HTTP web request.</returns> |
114 | public HttpWebRequest CreateWebRequest(string uri) | 114 | public HttpWebRequest CreateWebRequest(string uri) |
115 | { | 115 | { |
116 | #pragma warning disable SYSLIB0014 // Type or member is obsolete | ||
116 | HttpWebRequest request = (HttpWebRequest)WebRequest.Create(uri); | 117 | HttpWebRequest request = (HttpWebRequest)WebRequest.Create(uri); |
118 | #pragma warning restore SYSLIB0014 // Type or member is obsolete | ||
117 | request.UserAgent = String.Concat("WixInstall", this.Version.ToString()); | 119 | request.UserAgent = String.Concat("WixInstall", this.Version.ToString()); |
118 | 120 | ||
119 | return request; | 121 | return request; |
diff --git a/src/test/burn/WixToolset.WixBA/WixToolset.WixBA.csproj b/src/test/burn/WixToolset.WixBA/WixToolset.WixBA.csproj index b872457c..9ee714b6 100644 --- a/src/test/burn/WixToolset.WixBA/WixToolset.WixBA.csproj +++ b/src/test/burn/WixToolset.WixBA/WixToolset.WixBA.csproj | |||
@@ -2,7 +2,7 @@ | |||
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 Sdk="Microsoft.NET.Sdk"> | 3 | <Project Sdk="Microsoft.NET.Sdk"> |
4 | <PropertyGroup> | 4 | <PropertyGroup> |
5 | <TargetFrameworks>net472;net5.0-windows</TargetFrameworks> | 5 | <TargetFrameworks>net472;net6.0-windows</TargetFrameworks> |
6 | <AssemblyName>WixToolset.WixBA</AssemblyName> | 6 | <AssemblyName>WixToolset.WixBA</AssemblyName> |
7 | <RootNamespace>WixToolset.WixBA</RootNamespace> | 7 | <RootNamespace>WixToolset.WixBA</RootNamespace> |
8 | <DebugType>embedded</DebugType> | 8 | <DebugType>embedded</DebugType> |
diff --git a/src/test/burn/WixToolset.WixBA/WixToolset.WixBA_x64.csproj b/src/test/burn/WixToolset.WixBA/WixToolset.WixBA_x64.csproj index 672f7a62..9307c6c9 100644 --- a/src/test/burn/WixToolset.WixBA/WixToolset.WixBA_x64.csproj +++ b/src/test/burn/WixToolset.WixBA/WixToolset.WixBA_x64.csproj | |||
@@ -2,7 +2,7 @@ | |||
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 Sdk="Microsoft.NET.Sdk"> | 3 | <Project Sdk="Microsoft.NET.Sdk"> |
4 | <PropertyGroup> | 4 | <PropertyGroup> |
5 | <TargetFrameworks>net472;net5.0-windows</TargetFrameworks> | 5 | <TargetFrameworks>net472;net6.0-windows</TargetFrameworks> |
6 | <AssemblyName>WixToolset.WixBA</AssemblyName> | 6 | <AssemblyName>WixToolset.WixBA</AssemblyName> |
7 | <RootNamespace>WixToolset.WixBA</RootNamespace> | 7 | <RootNamespace>WixToolset.WixBA</RootNamespace> |
8 | <DebugType>embedded</DebugType> | 8 | <DebugType>embedded</DebugType> |