From 575392ab9b6c8b6b25cac0179d3b173c41ccb545 Mon Sep 17 00:00:00 2001
From: William Li <wul@microsoft.com>
Date: Wed, 4 Mar 2020 12:39:06 -0800
Subject: [PATCH 1/2] Correct feed

---
 NuGet.config            |  2 +-
 eng/Version.Details.xml | 22 +++++++++++-----------
 eng/Versions.props      |  6 +++---
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/NuGet.config b/NuGet.config
index 5625dbd3a..7b54ce752 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -7,7 +7,7 @@
   <packageSources>
     <clear />
     <!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
-    <add key="darc-pub-dotnet-core-setup-966115a" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-core-setup-966115a9/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-core-setup-916b5cb" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-core-setup-916b5cba/nuget/v3/index.json" />
     <add key="darc-pub-dotnet-corefx-0f7f38c" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-corefx-0f7f38c4/nuget/v3/index.json" />
     <add key="darc-pub-dotnet-aspnetcore-c3acdca-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-aspnetcore-c3acdcac-2/nuget/v3/index.json" />
     <!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index b6ed47bcd..426ff142d 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -3,23 +3,23 @@
   <ProductDependencies>
     <Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="3.1.2">
       <Uri>https://github.com/dotnet/core-setup</Uri>
-      <Sha>966115a91565d43cd545c1b8acd83eda2a0cb4cb</Sha>
+      <Sha>916b5cba268e1e1e803243004f4276cf40b2dda8</Sha>
     </Dependency>
     <Dependency Name="Microsoft.NETCore.App.Internal" Version="3.1.2-servicing.20067.4">
       <Uri>https://github.com/dotnet/core-setup</Uri>
-      <Sha>966115a91565d43cd545c1b8acd83eda2a0cb4cb</Sha>
+      <Sha>916b5cba268e1e1e803243004f4276cf40b2dda8</Sha>
     </Dependency>
     <Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="3.1.2">
       <Uri>https://github.com/dotnet/core-setup</Uri>
-      <Sha>966115a91565d43cd545c1b8acd83eda2a0cb4cb</Sha>
+      <Sha>916b5cba268e1e1e803243004f4276cf40b2dda8</Sha>
     </Dependency>
     <Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="3.1.2">
       <Uri>https://github.com/dotnet/core-setup</Uri>
-      <Sha>966115a91565d43cd545c1b8acd83eda2a0cb4cb</Sha>
+      <Sha>916b5cba268e1e1e803243004f4276cf40b2dda8</Sha>
     </Dependency>
     <Dependency Name="Microsoft.NETCore.DotNetHostResolver" Version="3.1.2">
       <Uri>https://github.com/dotnet/core-setup</Uri>
-      <Sha>966115a91565d43cd545c1b8acd83eda2a0cb4cb</Sha>
+      <Sha>916b5cba268e1e1e803243004f4276cf40b2dda8</Sha>
     </Dependency>
     <!-- Change blob version in GenerateLayout.targets if this is unpinned to service targeting pack -->
     <!-- No new netstandard.library planned for 3.1 timeframe at this time. -->
@@ -73,9 +73,9 @@
       <Uri>https://github.com/dotnet/templating</Uri>
       <Sha>247f60e9e34a03ed99e855eb1ea0c20931a968db</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Dotnet.Toolset.Internal" Version="3.1.200-preview.20152.4">
+    <Dependency Name="Microsoft.Dotnet.Toolset.Internal" Version="3.1.200-preview.20153.1">
       <Uri>https://github.com/dotnet/toolset</Uri>
-      <Sha>73f0352d1cc739ce20019e5b059dc3b4e1bf767d</Sha>
+      <Sha>b5160ead2f6b91d45b89edb3c29747f0a8e60a26</Sha>
     </Dependency>
     <Dependency Name="Microsoft.NET.Sdk" Version="3.1.200-preview.20126.2" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
       <Uri>https://github.com/dotnet/sdk</Uri>
@@ -86,13 +86,13 @@
       <Sha>a47ca8f97e48fd858e0ee2aaab05c11f0c9bda1a</Sha>
     </Dependency>
     <!-- For coherency purposes, these versions should be gated by the versions of winforms and wpf routed via core setup -->
-    <Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="4.8.1-servicing.20069.13" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="4.8.1-servicing.19605.5" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/winforms</Uri>
-      <Sha>b3a34e6695615d67a167fdbc436fce1e885f986e</Sha>
+      <Sha>9483a88b7764a74d71cbd449de6c56c1d5e0af21</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="3.1.2-servicing.20069.7" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="3.1.2-servicing.20066.4" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/wpf</Uri>
-      <Sha>b30a16a465c9a0ed7e641a9d55df2f6e5c878a81</Sha>
+      <Sha>589ace3c9fdfa0f1ea1640b82304a6a7ac597871</Sha>
     </Dependency>
     <!-- This is so that WCF packages are included in the final drop for official releases. -->
     <!-- Replace with better solution, see https://github.com/dotnet/arcade/issues/4162 -->
diff --git a/eng/Versions.props b/eng/Versions.props
index f8a64a108..6cf7d2e65 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -12,15 +12,15 @@
     <PreReleaseVersionLabel>preview</PreReleaseVersionLabel>
   </PropertyGroup>
   <PropertyGroup>
-    <MicrosoftDotnetToolsetInternalPackageVersion>3.1.200-preview.20152.4</MicrosoftDotnetToolsetInternalPackageVersion>
+    <MicrosoftDotnetToolsetInternalPackageVersion>3.1.200-preview.20153.1</MicrosoftDotnetToolsetInternalPackageVersion>
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependency from https://github.com/dotnet/winforms -->
-    <MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>4.8.1-servicing.20069.13</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
+    <MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>4.8.1-servicing.19605.5</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependency from https://github.com/dotnet/wpf -->
-    <MicrosoftDotNetWpfProjectTemplatesPackageVersion>3.1.2-servicing.20069.7</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
+    <MicrosoftDotNetWpfProjectTemplatesPackageVersion>3.1.2-servicing.20066.4</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependency from https://github.com/dotnet/templating -->

From 6dba88e32d3013655d403ce1bd7a4bc9502c946e Mon Sep 17 00:00:00 2001
From: William Li <wul@microsoft.com>
Date: Wed, 4 Mar 2020 12:39:36 -0800
Subject: [PATCH 2/2] Test to prevent apphost not being identical

---
 src/redist/targets/GenerateLayout.targets | 33 +++++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/src/redist/targets/GenerateLayout.targets b/src/redist/targets/GenerateLayout.targets
index f0007c176..7dd9a4408 100644
--- a/src/redist/targets/GenerateLayout.targets
+++ b/src/redist/targets/GenerateLayout.targets
@@ -471,6 +471,39 @@
 
   </Target>
 
+  <Target Name="VerifyApphostTemplateIsIdentifcal" Condition=" '$(HostOSName)' == 'osx' "
+          AfterTargets="LayoutAppHostTemplate"
+          DependsOnTargets="DownloadBundledComponents">
+
+    <PropertyGroup>
+      <NETCoreAppHostpkgPath>$(DownloadsFolder)$(DownloadedNetCoreAppHostPackInstallerFileName)</NETCoreAppHostpkgPath> 
+      <NETCoreAppHostpkgExtractPath>$(IntermediateOutputPath)AppHostpkgExtract\</NETCoreAppHostpkgExtractPath>
+    </PropertyGroup>
+
+    <!-- The folder cannot exist for pkgutil to run -->
+    <RemoveDir Directories="$(NETCoreAppHostpkgExtractPath)" />
+
+    <Exec Command="pkgutil --expand-full '$(NETCoreAppHostpkgPath)' '$(NETCoreAppHostpkgExtractPath)'" />
+
+    <ItemGroup>
+      <AllFilesOfAppHostPkg Include="$(NETCoreAppHostpkgExtractPath)\**\*.*" />
+      <ApphostInPkg
+          Include="@(AllFilesOfAppHostPkg)"
+          Condition="'%(FileName)%(Extension)' == '$(AppHostExecutableName)'"/>
+    </ItemGroup>
+
+    <Error Condition="@(ApphostInPkg->Distinct()->Count()) != 1"
+           Text="Failed to determine the $(NETCoreAppHostPackageName) executable in @(AllFilesOfAppHostPkg)" />
+
+    <Exec Command="diff '@(NativeRestoredAppHostNETCore->Distinct())' '@(ApphostInPkg->Distinct())' " ContinueOnError='true'>
+      <Output TaskParameter="ExitCode" PropertyName="DiffErrorCode"/>
+    </Exec>
+
+    <Error Text="The apphost from .pkg package and nupkg restore are not identical. There for cannot be notarized. File paths are '@(NativeRestoredAppHostNETCore->Distinct())' and '@(ApphostInPkg->Distinct())'"
+          Condition="'$(DiffErrorCode)' > '0'" />
+
+  </Target>
+
   <Target Name="GenerateLayout"
           DependsOnTargets="DownloadBundledComponents;
                             CleanLayoutPath;