Adding the winforms and wpf runtime to the SDK. For now, only for zips, as we don't have a msi yet to bundle up.

build/BuildDefaults.props

@@ -34,5 +34,8 @@
     <NoWarn>NU1701;NU5104</NoWarn>
 
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+
+    <IncludeWpfAndWinForms Condition=" '$(IncludeWpfAndWinForms)' == '' AND '$(OS)' == 'Windows_NT' ">true</IncludeWpfAndWinForms>
+    <IncludeWpfAndWinForms Condition=" '$(IncludeWpfAndWinForms)' == '' ">false</IncludeWpfAndWinForms>
   </PropertyGroup>
 </Project>

build/BundledRuntimes.props

@@ -42,6 +42,9 @@
     <AspNetCoreSharedFxArchiveFileName>aspnetcore-runtime-internal-$(AspNetCoreVersion)-$(AspNetCoreSharedFxArchiveRid)$(ArchiveExtension)</AspNetCoreSharedFxArchiveFileName>
     <AspNetCoreSharedFxArchiveFile>$(PackagesDirectory)/$(AspNetCoreSharedFxArchiveFileName)</AspNetCoreSharedFxArchiveFile>
 
+    <WinFormsAndWpfSharedFxArchiveFileName>dotnet-extension-$(WinFormsAndWpfVersion)-$(Architecture)$(ArchiveExtension)</WinFormsAndWpfSharedFxArchiveFileName>
+    <WinFormsAndWpfSharedFxArchiveFile>$(PackagesDirectory)/$(WinFormsAndWpfSharedFxArchiveFileName)</WinFormsAndWpfSharedFxArchiveFile>
+
     <!-- Used to detect if ASP.NET Core is built against the same version of Microsoft.NETCore.App. -->
     <AspNetCoreSharedFxBaseRuntimeVersionFileName>aspnetcore_base_runtime.version</AspNetCoreSharedFxBaseRuntimeVersionFileName>
     <AspNetCoreSharedFxBaseRuntimeVersionFile Condition=" '$(AspNetCoreSharedFxBaseRuntimeVersionFileName)' != '' ">$(PackagesDirectory)/$(AspNetCoreSharedFxBaseRuntimeVersionFileName)</AspNetCoreSharedFxBaseRuntimeVersionFile>
@@ -50,6 +53,7 @@
   <PropertyGroup>
     <CoreSetupRootUrl>$(CoreSetupBlobRootUrl)Runtime/</CoreSetupRootUrl>
     <AspNetCoreSharedFxRootUrl>$(CoreSetupBlobRootUrl)aspnetcore/Runtime/</AspNetCoreSharedFxRootUrl>
+    <WinFormsAndWpfSharedFxRootUrl>$(CoreSetupBlobRootUrl)dotnet-extensions/</WinFormsAndWpfSharedFxRootUrl>
     <CoreSetupDownloadDirectory>$(IntermediateDirectory)/coreSetupDownload/$(MicrosoftNETCoreAppPackageVersion)</CoreSetupDownloadDirectory>
     <CombinedSharedHostAndFrameworkArchive>$(CoreSetupDownloadDirectory)/combinedSharedHostAndFrameworkArchive$(ArchiveExtension)</CombinedSharedHostAndFrameworkArchive>
   </PropertyGroup>
@@ -112,6 +116,14 @@
       <DownloadFileName>$(AspNetCoreSharedFxBaseRuntimeVersionFile)</DownloadFileName>
       <ExtractDestination></ExtractDestination>
     </_DownloadAndExtractItem>
+  </ItemGroup>
 
+  <ItemGroup Condition=" '$(IncludeWpfAndWinForms)' != 'false' ">
+    <_DownloadAndExtractItem Include="WinFormsAndWpfSharedFxArchiveFile"
+                             Condition="!Exists('$(WinFormsAndWpfSharedFxArchiveFile)')">
+      <Url>$(WinFormsAndWpfSharedFxRootUrl)$(WinFormsAndWpfVersion)/$(WinFormsAndWpfSharedFxArchiveFileName)$(CoreSetupBlobAccessTokenParam)</Url>
+      <DownloadFileName>$(WinFormsAndWpfSharedFxArchiveFile)</DownloadFileName>
+      <ExtractDestination>$(WinFormsAndWpfSharedFxPublishDirectory)/shared</ExtractDestination>
+    </_DownloadAndExtractItem>
   </ItemGroup>
 </Project>

build/DependencyVersions.props

@@ -39,6 +39,7 @@
     <SharedHostVersion>$(MicrosoftNETCoreAppPackageVersion)</SharedHostVersion>
     <HostFxrVersion>$(MicrosoftNETCoreAppPackageVersion)</HostFxrVersion>
     <AspNetCoreVersion>$(MicrosoftAspNetCoreAppPackageVersion)</AspNetCoreVersion>
+    <WinFormsAndWpfVersion>3.0.0-alpha-26808-1</WinFormsAndWpfVersion>
   </PropertyGroup>
 
   <!-- infrastructure and test only dependencies -->

build/OutputDirectories.props

@@ -22,6 +22,7 @@
       <SharedFrameworkPublishDirectory>$(IntermediateDirectory)/sharedFrameworkPublish</SharedFrameworkPublishDirectory>
       <ToolsetPublishDirectory>$(IntermediateDirectory)/toolsetPublish</ToolsetPublishDirectory>
       <AspNetCoreSharedFxPublishDirectory>$(IntermediateDirectory)/aspnetSharedFxPublish</AspNetCoreSharedFxPublishDirectory>
+      <WinFormsAndWpfSharedFxPublishDirectory>$(IntermediateDirectory)/winFormsAndWpfSharedFxPublish</WinFormsAndWpfSharedFxPublishDirectory>
       <BackwardsCompatibleSharedFrameworksPublishDirectory>$(IntermediateDirectory)/backwardsCompatibleSharedFrameworksPublish</BackwardsCompatibleSharedFrameworksPublishDirectory>
       <TestOutputDir>$(BaseOutputDirectory)/test/</TestOutputDir>
       <DotnetInOutputDirectory>$(OutputDirectory)/dotnet$(ExeExtension)</DotnetInOutputDirectory>

src/redist/redist.csproj

@@ -38,6 +38,8 @@
     <ItemGroup>
       <SharedFramework Remove="*" />
       <SharedFramework Include="$(SharedFrameworkPublishDirectory)/**/*" />
+      <SharedFramework Include="$(AspNetCoreSharedFxPublishDirectory)/**/*" />
+      <SharedFramework Include="$(WinFormsAndWpfSharedFxPublishDirectory)/**/*" />
     </ItemGroup>
 
     <Copy SourceFiles="@(SharedFramework)"