aboutsummaryrefslogtreecommitdiff
path: root/src/dnchost
diff options
context:
space:
mode:
authorSean Hall <r.sean.hall@gmail.com>2020-11-02 19:43:20 -0600
committerSean Hall <r.sean.hall@gmail.com>2020-11-02 19:49:33 -0600
commit20ea356b2c0b4ab4d29778b4958d5b363f735f1f (patch)
tree64be40843e541eebe37ea0ffb5d7cb996f3ae699 /src/dnchost
parent0031d5e8f859b342ac9860b7055bb738b6303ec0 (diff)
downloadwix-20ea356b2c0b4ab4d29778b4958d5b363f735f1f.tar.gz
wix-20ea356b2c0b4ab4d29778b4958d5b363f735f1f.tar.bz2
wix-20ea356b2c0b4ab4d29778b4958d5b363f735f1f.zip
More .NET 5 updates.
Fix tests when running on machine with .NET 5. Update frameworks for .NET Core MBA (3.1 vs 5.0).
Diffstat (limited to 'src/dnchost')
-rw-r--r--src/dnchost/dnchost.vcxproj2
-rw-r--r--src/dnchost/dncutil.cpp9
-rw-r--r--src/dnchost/packages.config2
3 files changed, 10 insertions, 3 deletions
diff --git a/src/dnchost/dnchost.vcxproj b/src/dnchost/dnchost.vcxproj
index c6c2360c..d46c3a59 100644
--- a/src/dnchost/dnchost.vcxproj
+++ b/src/dnchost/dnchost.vcxproj
@@ -28,7 +28,7 @@
28 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> 28 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
29 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> 29 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
30 <PropertyGroup> 30 <PropertyGroup>
31 <NetHostPath>..\..\packages\runtime.win-x86.Microsoft.NETCore.DotNetAppHost.5.0.0-preview.7.20364.11\runtimes\win-x86\native\</NetHostPath> 31 <NetHostPath>..\..\packages\runtime.win-x86.Microsoft.NETCore.DotNetAppHost.5.0.0-rc.2.20475.5\runtimes\win-x86\native\</NetHostPath>
32 <ProjectAdditionalLinkLibraries>shlwapi.lib;$(NetHostPath)libnethost.lib</ProjectAdditionalLinkLibraries> 32 <ProjectAdditionalLinkLibraries>shlwapi.lib;$(NetHostPath)libnethost.lib</ProjectAdditionalLinkLibraries>
33 </PropertyGroup> 33 </PropertyGroup>
34 <ItemGroup> 34 <ItemGroup>
diff --git a/src/dnchost/dncutil.cpp b/src/dnchost/dncutil.cpp
index 4a82d961..89fe707f 100644
--- a/src/dnchost/dncutil.cpp
+++ b/src/dnchost/dncutil.cpp
@@ -182,7 +182,14 @@ static void HOSTFXR_CALLTYPE DnchostErrorWriter(
182 __in LPCWSTR wzMessage 182 __in LPCWSTR wzMessage
183 ) 183 )
184{ 184{
185 BalLog(BOOTSTRAPPER_LOG_LEVEL_ERROR, "error from hostfxr: %ls", wzMessage); 185 BOOTSTRAPPER_LOG_LEVEL level = BOOTSTRAPPER_LOG_LEVEL_ERROR;
186
187 if (CSTR_EQUAL == ::CompareString(LOCALE_INVARIANT, 0, wzMessage, -1, L"The requested delegate type is not available in the target framework.", -1))
188 {
189 level = BOOTSTRAPPER_LOG_LEVEL_DEBUG;
190 }
191
192 BalLog(level, "error from hostfxr: %ls", wzMessage);
186} 193}
187 194
188static HRESULT InitializeHostfxr( 195static HRESULT InitializeHostfxr(
diff --git a/src/dnchost/packages.config b/src/dnchost/packages.config
index d40327be..113d005c 100644
--- a/src/dnchost/packages.config
+++ b/src/dnchost/packages.config
@@ -4,7 +4,7 @@
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.3.37" targetFramework="native" developmentDependency="true" /> 6 <package id="Nerdbank.GitVersioning" version="3.3.37" targetFramework="native" developmentDependency="true" />
7 <package id="runtime.win-x86.Microsoft.NETCore.DotNetAppHost" version="5.0.0-preview.7.20364.11" targetFramework="native" /> 7 <package id="runtime.win-x86.Microsoft.NETCore.DotNetAppHost" version="5.0.0-rc.2.20475.5" targetFramework="native" />
8 <package id="WixToolset.BalUtil" version="4.0.41" targetFramework="native" /> 8 <package id="WixToolset.BalUtil" version="4.0.41" targetFramework="native" />
9 <package id="WixToolset.BootstrapperCore.Native" version="4.0.38" targetFramework="native" /> 9 <package id="WixToolset.BootstrapperCore.Native" version="4.0.38" targetFramework="native" />
10 <package id="WixToolset.DUtil" version="4.0.55" targetFramework="native" /> 10 <package id="WixToolset.DUtil" version="4.0.55" targetFramework="native" />