From 2ebdd8660a177681a847aa5c916ef82960a561c7 Mon Sep 17 00:00:00 2001
From: Jose Perez Rodriguez <joperezr@microsoft.com>
Date: Thu, 19 Sep 2019 09:56:43 -0700
Subject: [PATCH] Upgrading dotnet/corefx dependencies to stable (#726)

---
 NuGet.config                                       | 1 +
 eng/Version.Details.xml                            | 7 +++++++
 eng/Versions.props                                 | 3 +++
 src/Iot.Device.Bindings/Iot.Device.Bindings.csproj | 2 +-
 src/devices/RGBLedMatrix/RGBLedMatrix.csproj       | 2 +-
 src/devices/Ssd1351/Ssd1351.csproj                 | 2 +-
 src/devices/Ssd1351/samples/Ssd1351.Samples.csproj | 2 +-
 7 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/NuGet.config b/NuGet.config
index 1095ee13e9..718a040bfe 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -7,5 +7,6 @@
     <add key="dotnet-core" value="https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json" />
     <add key="myget.org" value="https://dotnet.myget.org/F/dotnet-core/api/v3/index.json" />
     <add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
+    <add key="internal-feed" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-corefx-4ac4c036/nuget/v3/index.json" />
   </packageSources>
 </configuration>
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 119104e92d..a985ad4685 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -14,4 +14,11 @@
       <Sha>8eb29ba860a3cfcfe68f9a8256caa7efc1f1aaba</Sha>
     </Dependency>
   </ToolsetDependencies>
+  <!-- ProductDependencies -->
+  <ProductDependencies>
+    <Dependency Name="System.Drawing.Common" Version="4.6.0">
+      <Uri>https://github.com/dotnet/corefx</Uri>
+      <Sha>4ac4c0367003fe3973a3648eb0715ddb0e3bbcea</Sha>
+    </Dependency>
+  </ProductDependencies>
 </Dependencies>
diff --git a/eng/Versions.props b/eng/Versions.props
index 922dd4ad64..63817e2320 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -3,6 +3,8 @@
   <PropertyGroup>
     <PreReleaseVersionLabel>prerelease</PreReleaseVersionLabel>
     <MicrosoftDotNetGenAPIPackageVersion>1.0.0-beta.19461.7</MicrosoftDotNetGenAPIPackageVersion>
+    <!-- dotnet/corefx dependencies -->
+    <SystemDrawingCommonPackageVersion>4.6.0</SystemDrawingCommonPackageVersion>
   </PropertyGroup>
   <!-- Restore sources -->
   <PropertyGroup>
@@ -13,6 +15,7 @@
       https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json;
       https://dotnet.myget.org/F/dotnet-core/api/v3/index.json;
       https://api.nuget.org/v3/index.json;
+      https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-corefx-4ac4c036/nuget/v3/index.json;
     </RestoreSources>
   </PropertyGroup>
 </Project>
diff --git a/src/Iot.Device.Bindings/Iot.Device.Bindings.csproj b/src/Iot.Device.Bindings/Iot.Device.Bindings.csproj
index 43da1d07ae..2aacacd2b4 100644
--- a/src/Iot.Device.Bindings/Iot.Device.Bindings.csproj
+++ b/src/Iot.Device.Bindings/Iot.Device.Bindings.csproj
@@ -21,7 +21,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="System.Drawing.Common" Version="4.6.0-preview4.19164.7" />
+    <PackageReference Include="System.Drawing.Common" Version="$(SystemDrawingCommonPackageVersion)" />
     <ProjectReference Include="$(MainLibraryPath)System.Device.Gpio.csproj">
       <AdditionalProperties>RuntimeIdentifier=linux</AdditionalProperties>
     </ProjectReference>
diff --git a/src/devices/RGBLedMatrix/RGBLedMatrix.csproj b/src/devices/RGBLedMatrix/RGBLedMatrix.csproj
index 012e409be4..16bc890718 100644
--- a/src/devices/RGBLedMatrix/RGBLedMatrix.csproj
+++ b/src/devices/RGBLedMatrix/RGBLedMatrix.csproj
@@ -10,7 +10,7 @@
     <ProjectReference Include="$(MainLibraryPath)System.Device.Gpio.csproj">
       <AdditionalProperties>$(AdditionalProperties);RuntimeIdentifier=linux</AdditionalProperties>
     </ProjectReference>
-    <PackageReference Include="System.Drawing.Common" Version="4.6.0-preview4.19164.7" />
+    <PackageReference Include="System.Drawing.Common" Version="$(SystemDrawingCommonPackageVersion)" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/devices/Ssd1351/Ssd1351.csproj b/src/devices/Ssd1351/Ssd1351.csproj
index 8b2995058c..dc7f851154 100644
--- a/src/devices/Ssd1351/Ssd1351.csproj
+++ b/src/devices/Ssd1351/Ssd1351.csproj
@@ -13,7 +13,7 @@
     <ProjectReference Include="$(MainLibraryPath)System.Device.Gpio.csproj">
       <AdditionalProperties>$(AdditionalProperties);RuntimeIdentifier=linux</AdditionalProperties>
     </ProjectReference>
-    <PackageReference Include="System.Drawing.Common" Version="4.6.0-preview4.19164.7" />
+    <PackageReference Include="System.Drawing.Common" Version="$(SystemDrawingCommonPackageVersion)" />
   </ItemGroup>
   
 </Project>
diff --git a/src/devices/Ssd1351/samples/Ssd1351.Samples.csproj b/src/devices/Ssd1351/samples/Ssd1351.Samples.csproj
index 77773c6b28..c322d62540 100644
--- a/src/devices/Ssd1351/samples/Ssd1351.Samples.csproj
+++ b/src/devices/Ssd1351/samples/Ssd1351.Samples.csproj
@@ -9,7 +9,7 @@
     <ProjectReference Include="$(MainLibraryPath)System.Device.Gpio.csproj">
       <AdditionalProperties>$(AdditionalProperties);RuntimeIdentifier=linux</AdditionalProperties>
     </ProjectReference>
-    <PackageReference Include="System.Drawing.Common" Version="4.6.0-preview4.19164.7" />    
+    <PackageReference Include="System.Drawing.Common" Version="$(SystemDrawingCommonPackageVersion)" />    
   </ItemGroup>
 
   <ItemGroup>