dotnet · dreddy-work · Feb 11, 2019 · Feb 12, 2019 · Feb 19, 2019 · Feb 19, 2019
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -24,8 +24,9 @@
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies> <!-- required due to https://github.com/tonerdo/coverlet/issues/72 -->
     <CoverletOutputFormat>opencover</CoverletOutputFormat>
     <Include>[System.Windows.*]*</Include>
-    <!-- Exclude only Obsolete and tagged with ExcludeFromCodeCoverage !!Avoid using this!! -->
-    <Exclude />
+    <!-- Exclude dependencies that embed their symbol information -->
+    <Exclude>[Microsoft.DotNet.XUnitExtensions]*,[xunit*]*</Exclude>
+    <!-- Exclude anything tagged with Obsolete or with ExcludeFromCodeCoverage !!Avoid using this!! -->
     <ExcludeByAttribute>Obsolete,ExcludeFromCodeCoverage</ExcludeByAttribute>
     <ExcludeByFile />
   </PropertyGroup>
@@ -39,4 +40,9 @@
     <DisableImplicitNETCorePlatformsReference>true</DisableImplicitNETCorePlatformsReference>
   </PropertyGroup>
 
+  <PropertyGroup>
+    <!-- Set RuntimeFrameworkVersion to MicrosoftNETCoreAppPackageVersion from Core Setup to prevent large SDK cycle -->
+    <RuntimeFrameworkVersion Condition="'$(MicrosoftNETCoreAppPackageVersion)'!='' And $(TargetFramework.StartsWith('netcoreapp3.')) ">$(MicrosoftNETCoreAppPackageVersion)</RuntimeFrameworkVersion>
+  </PropertyGroup>
+
 </Project>
diff --git a/Directory.Build.targets b/Directory.Build.targets
@@ -22,4 +22,18 @@
     <CallTarget Targets="GenerateCoverageResult" />
   </Target>
 
-</Project>
+  <ItemGroup>
+    <!-- Set TargetingPackVersion -->
+    <FrameworkReference Update="Microsoft.NETCore.App" 
+      Condition=" '$(MicrosoftNETCoreAppPackageVersion)'!='' And $(TargetFramework.StartsWith('netcoreapp3.')) ">
+    <TargetingPackVersion>$(MicrosoftNETCoreAppPackageVersion)</TargetingPackVersion>
+    </FrameworkReference>
+  </ItemGroup>
+
+  <PropertyGroup>
+    <!-- If TargetFramework is not netcoreapp3.x, then reset RuntimeFrameworkVersion -->
+    <!-- TODO: /p:EnableInstallDotNetCoreRuntimes=true to endable this for tests once dotnet/arcade#2343 is in -->
+    <RuntimeFrameworkVersion Condition="!$(TargetFramework.StartsWith('netcoreapp3.'))" />
+  </PropertyGroup>
+
+</Project>
diff --git a/Documentation/building.md b/Documentation/building.md
@@ -40,6 +40,8 @@ Note that this does **not** build using your machine-wide installed version of t
 * Other error may be from MSBuild tasks. You need to examine the build logs to investigate.
   * The logs are generated at `artifacts\log\Debug\Build.binlog`
   * The file format is an MSBuild Binary Log. Install the [MSBuild Structured Log Viewer][msbuild-log-viewer] to view them.
+* WinForms uses Visual Studio MSBuild but sometimes with a preview .NET Core SDK; so if you have a non-preview version of [Visual Studio][VS-download] (i.e. a release version), then you may need to enable `use preview` for .NET Core SDKs in VS.
+  * you can do this in VS at Tools :arrow_right: options :arrow_right: Projects and Solutions :arrow_right: .net core :arrow_right: use previews
 
 ## Creating a package
 
@@ -49,4 +51,5 @@ To create the Microsoft.Private.Winforms package, run `.\build -pack`
 
 [corefx-windows-instructions]: https://github.com/dotnet/corefx/blob/master/Documentation/building/windows-instructions.md
 [latest-core-build]: https://github.com/dotnet/core/blob/master/daily-builds.md
-[msbuild-log-viewer]: http://msbuildlog.com/
+[msbuild-log-viewer]: http://msbuildlog.com/
+[VS-download]: https://visualstudio.microsoft.com/downloads/
diff --git a/Documentation/developer-guide.md b/Documentation/developer-guide.md
@@ -6,7 +6,7 @@ The [Issue Guide](issue-guide.md) describes our approach to using GitHub issues.
 
 ## Machine Setup
 
-Follow the [Building CoreFX on Windows][corefx-windows-instructions] instructions. However, we recommend Visual Studio 2019 Preview 1.
+Follow the [Building CoreFX on Windows][corefx-windows-instructions] instructions. In particular, [Visual Studio 2019 Preview][vs-preview] is required to develop on .NET Core.
 
 Windows Forms requires the following workloads and components be selected when installing Visual Studio:
 
@@ -39,6 +39,7 @@ You first need to [Fork][fork] and [Clone][clone] this WinForms repository. This
 [comment]: <> (URI Links)
 
 [corefx-windows-instructions]: https://github.com/dotnet/corefx/blob/master/Documentation/building/windows-instructions.md
+[vs-preview]: https://visualstudio.microsoft.com/vs/preview/
 [fork]: https://github.com/dotnet/corefx/wiki/Checking-out-the-code-repository#fork-the-repository
 [clone]: https://github.com/dotnet/corefx/wiki/Checking-out-the-code-repository#clone-the-repository
 [git-commands]: https://github.com/dotnet/corefx/wiki/git-reference

diff --git a/Documentation/getting-started.md b/Documentation/getting-started.md
@@ -6,7 +6,7 @@ This document describes the experience of using WinForms on .NET Core. The [Deve
 
 Choose one of these options:
 
-1. [.NET Core 3.0 SDK Preview 1 (recommended)][.net-core-3.0-sdk-preview-1]
+1. [.NET Core 3.0 SDK Preview 1 (recommended)][.net-core-3.0-sdk-preview]
 
 1. [.NET Core 3.0 daily build (latest changes, but less stable)][.net-core-3.0-daily]
 
@@ -34,6 +34,6 @@ To port your existing WinForms application from .NET Framework to .NET Core 3.0,
 
 [comment]: <> (URI Links)
 
-[.net-core-3.0-sdk-preview-1]: https://www.microsoft.com/net/download
+[.net-core-3.0-sdk-preview]: https://dotnet.microsoft.com/download/dotnet-core/3.0
 [.net-core-3.0-daily]: https://github.com/dotnet/core/blob/master/daily-builds.md
-[.net-core-3.0-samples]: https://github.com/dotnet/samples/tree/master/windowsforms
+[.net-core-3.0-samples]: https://github.com/dotnet/samples/tree/master/windowsforms
diff --git a/Documentation/porting-guidelines.md b/Documentation/porting-guidelines.md
@@ -85,6 +85,10 @@ For additional information and assistance, we recommend checking out [this artic
 
 ## Migration tips
 
+### Include the System.Windows.Forms.Datavisualization Pack
+
+If you wish to use types previously associated with the [Charting control in the .NET Framework][framework-charting], you should add a package reference to the [NuGet package of Data Visualization][nuget-dataviz] ported to .NET Core. For more information about Data Visualization and the Charting control in .NET Core, including a sample application demonstrating its use, see the [winforms-datavisualization repository][dataviz]
+
 ### Include the Windows.Compatibility Pack
 
 Windows applications like Windows Forms and WPF often use APIs that aren't referenced by default in .NET Core. The reason is that .NET Core tries to reduce the risk that new applications accidentally depend on legacy technologies or on APIs that are Windows-only. However, when porting existing Windows applications, neither of these two aspects is a concern. To simplify your porting efforts, you can simply reference the [Windows Compatibility Pack][compat-pack], which will give
@@ -115,5 +119,8 @@ System.PlatformNotSupportedException: 'Configuration files are not supported.'
 [api-port]: https://blogs.msdn.microsoft.com/dotnet/2018/08/08/are-your-windows-forms-and-wpf-applications-ready-for-net-core-3-0/
 [pkg-config]: https://docs.microsoft.com/en-us/nuget/reference/migrate-packages-config-to-package-reference
 [sdk-tool]:https://github.com/hvanbakel/CsprojToVs2017
+[framework-charting]: https://docs.microsoft.com/en-us/dotnet/api/system.windows.forms.datavisualization.charting
+[nuget-dataviz]: https://www.nuget.org/packages/System.windows.forms.datavisualization
+[dataviz]: https://github.com/dotnet/winforms-datavisualization
 [compat-pack]: https://docs.microsoft.com/en-us/dotnet/core/porting/windows-compat-pack
-[wcf-supported]: https://github.com/dotnet/wcf/blob/master/release-notes/SupportedFeatures-v2.1.0.md
+[wcf-supported]: https://github.com/dotnet/wcf/blob/master/release-notes/SupportedFeatures-v2.1.0.md
diff --git a/Winforms.sln b/Winforms.sln
@@ -9,8 +9,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Windows.Forms", "src
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Windows.Forms.Tests", "src\System.Windows.Forms\tests\UnitTests\System.Windows.Forms.Tests.csproj", "{AB38E262-F206-4820-8F29-23C5F72A4A16}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Private.Winforms", "pkg\Microsoft.Private.Winforms.csproj", "{F133342A-3040-4005-A2F0-7685AA7CB82D}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Windows.Forms.Design.Editors", "src\System.Windows.Forms.Design.Editors\src\System.Windows.Forms.Design.Editors.csproj", "{B50AC96F-2655-4687-A404-16DF51882CBC}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Windows.Forms.Design.Editors.Tests", "src\System.Windows.Forms.Design.Editors\tests\UnitTests\System.Windows.Forms.Design.Editors.Tests.csproj", "{27F24D0C-5F0A-472E-AE12-98B386A13D50}"
@@ -23,6 +21,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Drawing.Design.Facad
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Design.Facade", "src\System.Design\src\System.Design.Facade.csproj", "{9BEC2806-D8E0-443B-8B58-9D344E0C2D24}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Private.Winforms", "pkg\Microsoft.Private.Winforms\Microsoft.Private.Winforms.csproj", "{F133342A-3040-4005-A2F0-7685AA7CB82D}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Dotnet.Winforms.ProjectTemplates", "pkg\Microsoft.Dotnet.WinForms.ProjectTemplates\Microsoft.Dotnet.Winforms.ProjectTemplates.csproj", "{36A5139E-3E9C-42BD-95EE-818153A487DB}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "pkg", "pkg", "{989F376E-AE19-43B0-A3E6-96A7E22B4E80}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{77FEDB47-F7F6-490D-AF7C-ABB4A9E0B9D7}"
@@ -116,6 +118,10 @@ Global
 		{6103E743-057D-41C6-946C-23A751A08748}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{6103E743-057D-41C6-946C-23A751A08748}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{6103E743-057D-41C6-946C-23A751A08748}.Release|Any CPU.Build.0 = Release|Any CPU
+		{36A5139E-3E9C-42BD-95EE-818153A487DB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{36A5139E-3E9C-42BD-95EE-818153A487DB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{36A5139E-3E9C-42BD-95EE-818153A487DB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{36A5139E-3E9C-42BD-95EE-818153A487DB}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -139,6 +145,7 @@ Global
 		{351D8601-6E21-45E8-B3B9-847C4540BD4E} = {088DD24C-DF6B-45F3-A8BC-592580A4B2A9}
 		{6103E743-057D-41C6-946C-23A751A08748} = {088DD24C-DF6B-45F3-A8BC-592580A4B2A9}
 		{088DD24C-DF6B-45F3-A8BC-592580A4B2A9} = {77FEDB47-F7F6-490D-AF7C-ABB4A9E0B9D7}
+		{36A5139E-3E9C-42BD-95EE-818153A487DB} = {989F376E-AE19-43B0-A3E6-96A7E22B4E80}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {7B1B0433-F612-4E5A-BE7E-FCF5B9F6E136}

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -5,7 +5,8 @@
 # so they can be used to control yaml flow.
 
 variables:
-
+  _PublishUsingPipelines: true
+  _DotNetArtifactsCategory: WINDOWSDESKTOP
   # clean the local repo on the build agents
   Build.Repository.Clean: true
 

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
@@ -7,73 +7,77 @@ Note: if the Uri is a new place, you will need to add a subscription from that p
 -->
 <Dependencies>
   <ProductDependencies>
-    <Dependency Name="Microsoft.Win32.Registry" Version="4.6.0-preview4.19181.2" CoherentParentDependency="Microsoft.NETCore.App">
-      <Uri>https://github.com/dotnet/corefx</Uri>
-      <Sha>2c1cf10610d8102e080b203ff396707eeced15bd</Sha>
+  </ProductDependencies>
+  <ToolsetDependencies>
+    <!-- Core Setup for coherency -->
+    <Dependency Name="Microsoft.NETCore.App" Version="3.0.0-preview6-27625-10">
+      <Uri>https://github.com/dotnet/core-setup</Uri>
+      <Sha>a2ccf1ad6ed1735ed1b1631661710c755356db00</Sha>
     </Dependency>
-    <Dependency Name="System.Configuration.ConfigurationManager" Version="4.6.0-preview4.19181.2" CoherentParentDependency="Microsoft.NETCore.App">
+    <!-- CoreFX via Core Setup -->
+    <Dependency Name="Microsoft.NETCore.Platforms" Version="3.0.0-preview6.19225.3" CoherentParentDependency="Microsoft.NETCore.App">
       <Uri>https://github.com/dotnet/corefx</Uri>
-      <Sha>2c1cf10610d8102e080b203ff396707eeced15bd</Sha>
+      <Sha>bdd2014f2d1863a296f76b5c90152ae016854afc</Sha>
     </Dependency>
-    <Dependency Name="System.Drawing.Common" Version="4.6.0-preview4.19181.2" CoherentParentDependency="Microsoft.NETCore.App">
+    <Dependency Name="Microsoft.Win32.Registry" Version="4.6.0-preview6.19225.3" CoherentParentDependency="Microsoft.NETCore.App">
       <Uri>https://github.com/dotnet/corefx</Uri>
-      <Sha>2c1cf10610d8102e080b203ff396707eeced15bd</Sha>
+      <Sha>bdd2014f2d1863a296f76b5c90152ae016854afc</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Win32.SystemEvents" Version="4.6.0-preview4.19181.2" CoherentParentDependency="Microsoft.NETCore.App">
+    <Dependency Name="Microsoft.Win32.SystemEvents" Version="4.6.0-preview6.19225.3" CoherentParentDependency="Microsoft.NETCore.App">
       <Uri>https://github.com/dotnet/corefx</Uri>
-      <Sha>2c1cf10610d8102e080b203ff396707eeced15bd</Sha>
+      <Sha>bdd2014f2d1863a296f76b5c90152ae016854afc</Sha>
     </Dependency>
-    <Dependency Name="System.Security.Cryptography.Cng" Version="4.6.0-preview4.19181.2" CoherentParentDependency="Microsoft.NETCore.App">
+    <Dependency Name="System.CodeDom" Version="4.6.0-preview6.19225.3" CoherentParentDependency="Microsoft.NETCore.App">
       <Uri>https://github.com/dotnet/corefx</Uri>
-      <Sha>2c1cf10610d8102e080b203ff396707eeced15bd</Sha>
+      <Sha>bdd2014f2d1863a296f76b5c90152ae016854afc</Sha>
     </Dependency>
-    <Dependency Name="System.CodeDom" Version="4.6.0-preview4.19181.2" CoherentParentDependency="Microsoft.NETCore.App">
+    <Dependency Name="System.Configuration.ConfigurationManager" Version="4.6.0-preview6.19225.3" CoherentParentDependency="Microsoft.NETCore.App">
       <Uri>https://github.com/dotnet/corefx</Uri>
-      <Sha>2c1cf10610d8102e080b203ff396707eeced15bd</Sha>
+      <Sha>bdd2014f2d1863a296f76b5c90152ae016854afc</Sha>
     </Dependency>
-    <Dependency Name="System.Security.Permissions" Version="4.6.0-preview4.19181.2" CoherentParentDependency="Microsoft.NETCore.App">
+    <Dependency Name="System.Drawing.Common" Version="4.6.0-preview6.19225.3" CoherentParentDependency="Microsoft.NETCore.App">
       <Uri>https://github.com/dotnet/corefx</Uri>
-      <Sha>2c1cf10610d8102e080b203ff396707eeced15bd</Sha>
+      <Sha>bdd2014f2d1863a296f76b5c90152ae016854afc</Sha>
     </Dependency>
-    <Dependency Name="System.Windows.Extensions" Version="4.6.0-preview4.19181.2" CoherentParentDependency="Microsoft.NETCore.App">
+    <Dependency Name="System.Security.Cryptography.Cng" Version="4.6.0-preview6.19225.3" CoherentParentDependency="Microsoft.NETCore.App">
       <Uri>https://github.com/dotnet/corefx</Uri>
-      <Sha>2c1cf10610d8102e080b203ff396707eeced15bd</Sha>
+      <Sha>bdd2014f2d1863a296f76b5c90152ae016854afc</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NETCore.App" Version="3.0.0-preview4-27601-04">
-      <Uri>https://github.com/dotnet/core-setup</Uri>
-      <Sha>4ea0233e38681384ee91d7a72c011db9c02e35ff</Sha>
+    <Dependency Name="System.Security.Permissions" Version="4.6.0-preview6.19225.3" CoherentParentDependency="Microsoft.NETCore.App">
+      <Uri>https://github.com/dotnet/corefx</Uri>
+      <Sha>bdd2014f2d1863a296f76b5c90152ae016854afc</Sha>
     </Dependency>
-  </ProductDependencies>
-  <ToolsetDependencies>
-    <Dependency Name="Microsoft.NETCore.Platforms" Version="3.0.0-preview4.19181.2" CoherentParentDependency="Microsoft.NETCore.App">
+    <Dependency Name="System.Windows.Extensions" Version="4.6.0-preview6.19225.3" CoherentParentDependency="Microsoft.NETCore.App">
       <Uri>https://github.com/dotnet/corefx</Uri>
-      <Sha>2c1cf10610d8102e080b203ff396707eeced15bd</Sha>
+      <Sha>bdd2014f2d1863a296f76b5c90152ae016854afc</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19201.12">
-      <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>505e38906e1ee2d032c41bb297de0958307db946</Sha>
+    <!-- CoreCLR via Core Setup -->
+    <Dependency Name="Microsoft.NET.Sdk.IL" Version="3.0.0-preview6-27624-71" CoherentParentDependency="Microsoft.NETCore.App">
+      <Uri>https://github.com/dotnet/coreclr</Uri>
+      <Sha>8808f4eab10d1760182590cad4964f566b9c88ca</Sha>
+      <SourceBuildId>5596</SourceBuildId>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.GenFacades" Version="1.0.0-beta.19201.12">
-      <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>505e38906e1ee2d032c41bb297de0958307db946</Sha>
+    <Dependency Name="Microsoft.NETCore.ILAsm" Version="3.0.0-preview6-27624-71" CoherentParentDependency="Microsoft.NETCore.App">
+      <Uri>https://github.com/dotnet/coreclr</Uri>
+      <Sha>8808f4eab10d1760182590cad4964f566b9c88ca</Sha>
+      <SourceBuildId>5596</SourceBuildId>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="2.4.0-beta.19201.12">
+    <!-- Arcade -->
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19224.9">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>505e38906e1ee2d032c41bb297de0958307db946</Sha>
+      <Sha>e02c88fca482f1141a9bb310c97be20b0ebd0465</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="2.0.0-beta.19201.12">
+    <Dependency Name="Microsoft.DotNet.GenFacades" Version="1.0.0-beta.19224.9">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>505e38906e1ee2d032c41bb297de0958307db946</Sha>
+      <Sha>e02c88fca482f1141a9bb310c97be20b0ebd0465</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NET.Sdk.IL" Version="3.0.0-preview4-27525-72" CoherentParentDependency="Microsoft.NETCore.App">
-      <Uri>https://github.com/dotnet/coreclr</Uri>
-      <Sha>2520798548b0c414f513aaaf708399f8ef5a4f6c</Sha>
-      <SourceBuildId>5596</SourceBuildId>
+    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="2.0.0-beta.19224.9">
+      <Uri>https://github.com/dotnet/arcade</Uri>
+      <Sha>e02c88fca482f1141a9bb310c97be20b0ebd0465</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NETCore.ILAsm" Version="3.0.0-preview4-27525-72" CoherentParentDependency="Microsoft.NETCore.App">
-      <Uri>https://github.com/dotnet/coreclr</Uri>
-      <Sha>2520798548b0c414f513aaaf708399f8ef5a4f6c</Sha>
-      <SourceBuildId>5596</SourceBuildId>
+    <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="2.4.0-beta.19224.9">
+      <Uri>https://github.com/dotnet/arcade</Uri>
+      <Sha>e02c88fca482f1141a9bb310c97be20b0ebd0465</Sha>
     </Dependency>
   </ToolsetDependencies>
 </Dependencies>