From 557d867e4b215f0204f25aeca0fefb35899e0b79 Mon Sep 17 00:00:00 2001
From: Bastian Eicher <bastian@eicher.net>
Date: Mon, 20 Jul 2020 21:53:42 +0200
Subject: [PATCH] Added missing runtime configuration for native libraries

---
 doc/build.ps1                                      | 2 +-
 feed/build.ps1                                     | 2 +-
 src/Commands/App.config                            | 6 ++++++
 src/Commands/Commands.csproj                       | 3 +++
 src/DesktopIntegration/DesktopIntegration.csproj   | 1 +
 src/Model/Model.csproj                             | 5 ++++-
 src/Publish/Publish.csproj                         | 3 +++
 src/Services.Interfaces/Services.Interfaces.csproj | 3 +++
 src/Services/Services.csproj                       | 3 +++
 src/Store/Store.csproj                             | 3 +++
 src/UnitTests/UnitTests.csproj                     | 3 +++
 11 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/doc/build.ps1 b/doc/build.ps1
index b75ae7935..8c6299519 100644
--- a/doc/build.ps1
+++ b/doc/build.ps1
@@ -4,7 +4,7 @@ pushd $PSScriptRoot
 
 # Ensure 0install is in PATH
 if (!(Get-Command 0install -ErrorAction SilentlyContinue)) {
-    $env:PATH = "$(Resolve-Path ..\artifacts\Release\net45);$env:PATH"
+    $env:PATH = "$(Resolve-Path ..\artifacts\Release\net45\win);$env:PATH"
 }
 
 if (Test-Path ..\artifacts\Documentation) {rm -Recurse -Force ..\artifacts\Documentation}
diff --git a/feed/build.ps1 b/feed/build.ps1
index 9754aca8d..b6ae5d901 100644
--- a/feed/build.ps1
+++ b/feed/build.ps1
@@ -4,7 +4,7 @@ pushd $PSScriptRoot
 
 # Ensure 0install is in PATH
 if (!(Get-Command 0install -ErrorAction SilentlyContinue)) {
-    $env:PATH = "$(Resolve-Path ..\artifacts\Release\net45);$env:PATH"
+    $env:PATH = "$(Resolve-Path ..\artifacts\Release\net45\win);$env:PATH"
 }
 
 # Build feed and archive
diff --git a/src/Commands/App.config b/src/Commands/App.config
index fca102beb..17645aa96 100644
--- a/src/Commands/App.config
+++ b/src/Commands/App.config
@@ -13,6 +13,12 @@
     <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
   </startup>
   <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+         <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+         <bindingRedirect oldVersion="4.0.4.0" newVersion="4.0.6.0"/>
+      </dependentAssembly>
+    </assemblyBinding>
     <relativeBindForResources enabled="true" />
     <enforceFIPSPolicy enabled="false" />
     <generatePublisherEvidence enabled="false" />
diff --git a/src/Commands/Commands.csproj b/src/Commands/Commands.csproj
index 590cbc03e..69618ff6f 100644
--- a/src/Commands/Commands.csproj
+++ b/src/Commands/Commands.csproj
@@ -21,6 +21,9 @@
     <IncludeSymbols>True</IncludeSymbols>
     <SymbolPackageFormat>snupkg</SymbolPackageFormat>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(TargetFramework)'=='net45'">
+    <RuntimeIdentifier>win</RuntimeIdentifier>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(TargetFramework)'=='netcoreapp3.1'">
     <Nullable>enable</Nullable>
   </PropertyGroup>
diff --git a/src/DesktopIntegration/DesktopIntegration.csproj b/src/DesktopIntegration/DesktopIntegration.csproj
index dd98b1d1f..11b8a8dc0 100644
--- a/src/DesktopIntegration/DesktopIntegration.csproj
+++ b/src/DesktopIntegration/DesktopIntegration.csproj
@@ -6,6 +6,7 @@
     <RootNamespace>ZeroInstall.DesktopIntegration</RootNamespace>
     <LangVersion>8.0</LangVersion>
     <TargetFramework>net45</TargetFramework>
+    <RuntimeIdentifier>win</RuntimeIdentifier>
     <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
     <GenerateDocumentationFile>True</GenerateDocumentationFile>
     <NoWarn>$(NoWarn);1591</NoWarn>
diff --git a/src/Model/Model.csproj b/src/Model/Model.csproj
index a5149d860..92a9323eb 100644
--- a/src/Model/Model.csproj
+++ b/src/Model/Model.csproj
@@ -18,6 +18,9 @@
     <IncludeSymbols>True</IncludeSymbols>
     <SymbolPackageFormat>snupkg</SymbolPackageFormat>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(TargetFramework)'=='net45'">
+    <RuntimeIdentifier>win</RuntimeIdentifier>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(TargetFramework)'=='netstandard2.1'">
     <Nullable>enable</Nullable>
   </PropertyGroup>
@@ -58,7 +61,7 @@
     <PackageReference Include="Microsoft.XmlSerializer.Generator" Version="2.2.1" PrivateAssets="All" />
   </ItemGroup>-->
   <ItemGroup Condition="'$(MSBuildRuntimeType)'=='Full'">
-    <None Include="..\..\artifacts\$(Configuration)\net45\$(AssemblyName).XmlSerializers.dll" Pack="true" PackagePath="lib/net45" />
+    <None Include="..\..\artifacts\$(Configuration)\net45\win\$(AssemblyName).XmlSerializers.dll" Pack="true" PackagePath="lib/net45" />
     <!--<None Include="..\..\artifacts\$(Configuration)\netstandard2.0\$(AssemblyName).XmlSerializers.dll" Pack="true" PackagePath="lib/netstandard2.0" />-->
   </ItemGroup>
 
diff --git a/src/Publish/Publish.csproj b/src/Publish/Publish.csproj
index 12a952e63..f9ecacaf2 100644
--- a/src/Publish/Publish.csproj
+++ b/src/Publish/Publish.csproj
@@ -18,6 +18,9 @@
     <IncludeSymbols>True</IncludeSymbols>
     <SymbolPackageFormat>snupkg</SymbolPackageFormat>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(TargetFramework)'=='net45'">
+    <RuntimeIdentifier>win</RuntimeIdentifier>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(TargetFramework)'=='netstandard2.1'">
     <Nullable>enable</Nullable>
   </PropertyGroup>
diff --git a/src/Services.Interfaces/Services.Interfaces.csproj b/src/Services.Interfaces/Services.Interfaces.csproj
index 5d379022a..14b01be34 100644
--- a/src/Services.Interfaces/Services.Interfaces.csproj
+++ b/src/Services.Interfaces/Services.Interfaces.csproj
@@ -18,6 +18,9 @@
     <IncludeSymbols>True</IncludeSymbols>
     <SymbolPackageFormat>snupkg</SymbolPackageFormat>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(TargetFramework)'=='net45'">
+    <RuntimeIdentifier>win</RuntimeIdentifier>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(TargetFramework)'=='netstandard2.1'">
     <Nullable>enable</Nullable>
   </PropertyGroup>
diff --git a/src/Services/Services.csproj b/src/Services/Services.csproj
index 6e00352ec..db454255a 100644
--- a/src/Services/Services.csproj
+++ b/src/Services/Services.csproj
@@ -18,6 +18,9 @@
     <IncludeSymbols>True</IncludeSymbols>
     <SymbolPackageFormat>snupkg</SymbolPackageFormat>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(TargetFramework)'=='net45'">
+    <RuntimeIdentifier>win</RuntimeIdentifier>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(TargetFramework)'=='netstandard2.1'">
     <Nullable>enable</Nullable>
   </PropertyGroup>
diff --git a/src/Store/Store.csproj b/src/Store/Store.csproj
index f36c267e4..b58e5b009 100644
--- a/src/Store/Store.csproj
+++ b/src/Store/Store.csproj
@@ -18,6 +18,9 @@
     <IncludeSymbols>True</IncludeSymbols>
     <SymbolPackageFormat>snupkg</SymbolPackageFormat>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(TargetFramework)'=='net45'">
+    <RuntimeIdentifier>win</RuntimeIdentifier>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(TargetFramework)'=='netstandard2.1'">
     <Nullable>enable</Nullable>
   </PropertyGroup>
diff --git a/src/UnitTests/UnitTests.csproj b/src/UnitTests/UnitTests.csproj
index fb70938f1..afefee294 100644
--- a/src/UnitTests/UnitTests.csproj
+++ b/src/UnitTests/UnitTests.csproj
@@ -15,6 +15,9 @@
     <SignAssembly>True</SignAssembly>
     <AssemblyOriginatorKeyFile>..\sgKey.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(TargetFramework)'=='net48'">
+    <RuntimeIdentifier>win</RuntimeIdentifier>
+  </PropertyGroup>
 
   <!-- Dependencies -->
   <ItemGroup>