From 718f2ffab6cc13b2beeb3809b703a1c2ab05dd3f Mon Sep 17 00:00:00 2001
From: Matthew Leibowitz <mattleibow@live.com>
Date: Wed, 15 Aug 2018 21:06:03 +0200
Subject: [PATCH] Remove the version number form the base win RID #599  -
 Windows 7 is the minimum version anyway, so this does not really matter

---
 .../HarfBuzzSharp.Desktop/HarfBuzzSharp.Desktop.csproj |  4 ++--
 .../nuget/build/net45/HarfBuzzSharp.targets            | 10 +++++-----
 binding/SkiaSharp.Desktop/SkiaSharp.Desktop.csproj     |  4 ++--
 .../nuget/build/net45/SkiaSharp.targets                | 10 +++++-----
 nuget/HarfbuzzSharp.nuspec                             |  4 ++--
 nuget/SkiaSharp.nuspec                                 |  4 ++--
 6 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/binding/HarfBuzzSharp.Desktop/HarfBuzzSharp.Desktop.csproj b/binding/HarfBuzzSharp.Desktop/HarfBuzzSharp.Desktop.csproj
index c816b7bfae..3f204ccad3 100644
--- a/binding/HarfBuzzSharp.Desktop/HarfBuzzSharp.Desktop.csproj
+++ b/binding/HarfBuzzSharp.Desktop/HarfBuzzSharp.Desktop.csproj
@@ -21,8 +21,8 @@
     <PackageReference Include="MSBuild.Sdk.Extras" Version="1.6.41" PrivateAssets="All" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="..\..\output\native\windows\x64\libHarfBuzzSharp.dll" Link="nuget\runtimes\win7-x64\native\libHarfBuzzSharp.dll" Condition=" '$(IsWindows)' == 'true' " />
-    <None Include="..\..\output\native\windows\x86\libHarfBuzzSharp.dll" Link="nuget\runtimes\win7-x86\native\libHarfBuzzSharp.dll" Condition=" '$(IsWindows)' == 'true' " />
+    <None Include="..\..\output\native\windows\x64\libHarfBuzzSharp.dll" Link="nuget\runtimes\win-x64\native\libHarfBuzzSharp.dll" Condition=" '$(IsWindows)' == 'true' " />
+    <None Include="..\..\output\native\windows\x86\libHarfBuzzSharp.dll" Link="nuget\runtimes\win-x86\native\libHarfBuzzSharp.dll" Condition=" '$(IsWindows)' == 'true' " />
     <None Include="..\..\output\native\osx\libHarfBuzzSharp.dylib" Link="nuget\runtimes\osx\native\libHarfBuzzSharp.dylib" Condition=" '$(IsMacOS)' == 'true' " />
     <None Include="..\..\output\native\linux\x64\libHarfBuzzSharp.so" Link="nuget\runtimes\linux-x64\native\libHarfBuzzSharp.so" Condition=" '$(IsLinux)' == 'true' " />
     <None Include="nuget\build\net45\HarfBuzzSharp.targets" />
diff --git a/binding/HarfBuzzSharp.Desktop/nuget/build/net45/HarfBuzzSharp.targets b/binding/HarfBuzzSharp.Desktop/nuget/build/net45/HarfBuzzSharp.targets
index d5e5af9eb8..7fda95d9ca 100644
--- a/binding/HarfBuzzSharp.Desktop/nuget/build/net45/HarfBuzzSharp.targets
+++ b/binding/HarfBuzzSharp.Desktop/nuget/build/net45/HarfBuzzSharp.targets
@@ -24,7 +24,7 @@
 
     <!-- get the preferred paths -->
     <PropertyGroup>
-        <PreferredWindowsNativeHarfBuzzSharpPath>$(MSBuildThisFileDirectory)..\..\runtimes\win7-$(PreferredNativeHarfBuzzSharp)\native\libHarfBuzzSharp.dll</PreferredWindowsNativeHarfBuzzSharpPath>
+        <PreferredWindowsNativeHarfBuzzSharpPath>$(MSBuildThisFileDirectory)..\..\runtimes\win-$(PreferredNativeHarfBuzzSharp)\native\libHarfBuzzSharp.dll</PreferredWindowsNativeHarfBuzzSharpPath>
         <PreferredOSXNativeHarfBuzzSharpPath>$(MSBuildThisFileDirectory)..\..\runtimes\osx\native\libHarfBuzzSharp.dylib</PreferredOSXNativeHarfBuzzSharpPath>
         <PreferredLinuxNativeHarfBuzzSharpPath>$(MSBuildThisFileDirectory)..\..\runtimes\linux-$(PreferredNativeHarfBuzzSharp)\native\libHarfBuzzSharp.so</PreferredLinuxNativeHarfBuzzSharpPath>
     </PropertyGroup>
@@ -47,13 +47,13 @@
     <!-- a special case for Any CPU -->
     <ItemGroup Condition=" '$(ShouldIncludeNativeHarfBuzzSharp)' != 'False' and ( '$(PlatformTarget)' != 'x64' and '$(PlatformTarget)' != 'x86' ) ">
         <!-- Windows -->
-        <None Include="$(MSBuildThisFileDirectory)..\..\runtimes\win7-x86\native\libHarfBuzzSharp.dll"
-              Condition="Exists('$(MSBuildThisFileDirectory)..\..\runtimes\win7-x86\native\libHarfBuzzSharp.dll')">
+        <None Include="$(MSBuildThisFileDirectory)..\..\runtimes\win-x86\native\libHarfBuzzSharp.dll"
+              Condition="Exists('$(MSBuildThisFileDirectory)..\..\runtimes\win-x86\native\libHarfBuzzSharp.dll')">
             <Link>x86\libHarfBuzzSharp.dll</Link>
             <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
         </None>
-        <None Include="$(MSBuildThisFileDirectory)..\..\runtimes\win7-x64\native\libHarfBuzzSharp.dll"
-              Condition="Exists('$(MSBuildThisFileDirectory)..\..\runtimes\win7-x64\native\libHarfBuzzSharp.dll')">
+        <None Include="$(MSBuildThisFileDirectory)..\..\runtimes\win-x64\native\libHarfBuzzSharp.dll"
+              Condition="Exists('$(MSBuildThisFileDirectory)..\..\runtimes\win-x64\native\libHarfBuzzSharp.dll')">
             <Link>x64\libHarfBuzzSharp.dll</Link>
             <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
         </None>
diff --git a/binding/SkiaSharp.Desktop/SkiaSharp.Desktop.csproj b/binding/SkiaSharp.Desktop/SkiaSharp.Desktop.csproj
index b64aad0030..62b32edcfa 100644
--- a/binding/SkiaSharp.Desktop/SkiaSharp.Desktop.csproj
+++ b/binding/SkiaSharp.Desktop/SkiaSharp.Desktop.csproj
@@ -21,8 +21,8 @@
     <PackageReference Include="MSBuild.Sdk.Extras" Version="1.6.41" PrivateAssets="All" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="..\..\output\native\windows\x64\libSkiaSharp.dll" Link="nuget\runtimes\win7-x64\native\libSkiaSharp.dll" Condition=" '$(IsWindows)' == 'true' " />
-    <None Include="..\..\output\native\windows\x86\libSkiaSharp.dll" Link="nuget\runtimes\win7-x86\native\libSkiaSharp.dll" Condition=" '$(IsWindows)' == 'true' " />
+    <None Include="..\..\output\native\windows\x64\libSkiaSharp.dll" Link="nuget\runtimes\win-x64\native\libSkiaSharp.dll" Condition=" '$(IsWindows)' == 'true' " />
+    <None Include="..\..\output\native\windows\x86\libSkiaSharp.dll" Link="nuget\runtimes\win-x86\native\libSkiaSharp.dll" Condition=" '$(IsWindows)' == 'true' " />
     <None Include="..\..\output\native\osx\libSkiaSharp.dylib" Link="nuget\runtimes\osx\native\libSkiaSharp.dylib" Condition=" '$(IsMacOS)' == 'true' " />
     <None Include="..\..\output\native\linux\x64\libSkiaSharp.so" Link="nuget\runtimes\linux-x64\native\libSkiaSharp.so" Condition=" '$(IsLinux)' == 'true' " />
     <None Include="nuget\build\net45\SkiaSharp.targets" />
diff --git a/binding/SkiaSharp.Desktop/nuget/build/net45/SkiaSharp.targets b/binding/SkiaSharp.Desktop/nuget/build/net45/SkiaSharp.targets
index 8c3444d79b..38c0de7240 100644
--- a/binding/SkiaSharp.Desktop/nuget/build/net45/SkiaSharp.targets
+++ b/binding/SkiaSharp.Desktop/nuget/build/net45/SkiaSharp.targets
@@ -24,7 +24,7 @@
 
     <!-- get the preferred paths -->
     <PropertyGroup>
-        <PreferredWindowsNativeSkiaSharpPath>$(MSBuildThisFileDirectory)..\..\runtimes\win7-$(PreferredNativeSkiaSharp)\native\libSkiaSharp.dll</PreferredWindowsNativeSkiaSharpPath>
+        <PreferredWindowsNativeSkiaSharpPath>$(MSBuildThisFileDirectory)..\..\runtimes\win-$(PreferredNativeSkiaSharp)\native\libSkiaSharp.dll</PreferredWindowsNativeSkiaSharpPath>
         <PreferredOSXNativeSkiaSharpPath>$(MSBuildThisFileDirectory)..\..\runtimes\osx\native\libSkiaSharp.dylib</PreferredOSXNativeSkiaSharpPath>
         <PreferredLinuxNativeSkiaSharpPath>$(MSBuildThisFileDirectory)..\..\runtimes\linux-$(PreferredNativeSkiaSharp)\native\libSkiaSharp.so</PreferredLinuxNativeSkiaSharpPath>
     </PropertyGroup>
@@ -47,13 +47,13 @@
     <!-- a special case for Any CPU -->
     <ItemGroup Condition=" '$(ShouldIncludeNativeSkiaSharp)' != 'False' and ( '$(PlatformTarget)' != 'x64' and '$(PlatformTarget)' != 'x86' ) ">
         <!-- Windows -->
-        <None Include="$(MSBuildThisFileDirectory)..\..\runtimes\win7-x86\native\libSkiaSharp.dll"
-              Condition="Exists('$(MSBuildThisFileDirectory)..\..\runtimes\win7-x86\native\libSkiaSharp.dll')">
+        <None Include="$(MSBuildThisFileDirectory)..\..\runtimes\win-x86\native\libSkiaSharp.dll"
+              Condition="Exists('$(MSBuildThisFileDirectory)..\..\runtimes\win-x86\native\libSkiaSharp.dll')">
             <Link>x86\libSkiaSharp.dll</Link>
             <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
         </None>
-        <None Include="$(MSBuildThisFileDirectory)..\..\runtimes\win7-x64\native\libSkiaSharp.dll"
-              Condition="Exists('$(MSBuildThisFileDirectory)..\..\runtimes\win7-x64\native\libSkiaSharp.dll')">
+        <None Include="$(MSBuildThisFileDirectory)..\..\runtimes\win-x64\native\libSkiaSharp.dll"
+              Condition="Exists('$(MSBuildThisFileDirectory)..\..\runtimes\win-x64\native\libSkiaSharp.dll')">
             <Link>x64\libSkiaSharp.dll</Link>
             <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
         </None>
diff --git a/nuget/HarfbuzzSharp.nuspec b/nuget/HarfbuzzSharp.nuspec
index 8de6fcdff1..709d09363b 100644
--- a/nuget/HarfbuzzSharp.nuspec
+++ b/nuget/HarfbuzzSharp.nuspec
@@ -54,8 +54,8 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release
     <file src="build/tizen40/HarfBuzzSharp.targets" />
 
     <!-- harfbuzz.dll and other native files -->
-    <file platform="windows" src="runtimes/win7-x64/native/libHarfBuzzSharp.dll" />
-    <file platform="windows" src="runtimes/win7-x86/native/libHarfBuzzSharp.dll" />
+    <file platform="windows" src="runtimes/win-x64/native/libHarfBuzzSharp.dll" />
+    <file platform="windows" src="runtimes/win-x86/native/libHarfBuzzSharp.dll" />
     <file platform="macos" src="runtimes/osx/native/libHarfBuzzSharp.dylib" />
     <file platform="windows" src="runtimes/win10-x64/nativeassets/uap10.0/libHarfBuzzSharp.dll" />
     <file platform="windows" src="runtimes/win10-x86/nativeassets/uap10.0/libHarfBuzzSharp.dll" />
diff --git a/nuget/SkiaSharp.nuspec b/nuget/SkiaSharp.nuspec
index d8de62fda0..cf3d842377 100644
--- a/nuget/SkiaSharp.nuspec
+++ b/nuget/SkiaSharp.nuspec
@@ -55,8 +55,8 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release
     <file src="build/tizen40/SkiaSharp.targets" />
 
     <!-- libSkiaSharp.dll and other native files -->
-    <file platform="windows" src="runtimes/win7-x64/native/libSkiaSharp.dll" />
-    <file platform="windows" src="runtimes/win7-x86/native/libSkiaSharp.dll" />
+    <file platform="windows" src="runtimes/win-x64/native/libSkiaSharp.dll" />
+    <file platform="windows" src="runtimes/win-x86/native/libSkiaSharp.dll" />
     <file platform="macos" src="runtimes/osx/native/libSkiaSharp.dylib" />
     <file platform="windows" src="runtimes/win10-x64/nativeassets/uap10.0/libSkiaSharp.dll" />
     <file platform="windows" src="runtimes/win10-x86/nativeassets/uap10.0/libSkiaSharp.dll" />