From 806fe82f6442d50511e754596479e07a28fc022b Mon Sep 17 00:00:00 2001
From: Manodasan Wignarajah <mawign@microsoft.com>
Date: Wed, 2 Jun 2021 11:32:47 -0700
Subject: [PATCH] Update dotnet SDK to to address VS 16.10 regressions (#857)

* Update .NET SDK

* Remove compilers toolset package to use newer default.

* Update workspaces package version

* Fix one more version.
---
 .../WinRT.SourceGenerator/WinRT.SourceGenerator.csproj      | 2 +-
 src/Directory.Build.targets                                 | 6 ------
 src/Tests/DiagnosticTests/DiagnosticTests.csproj            | 2 +-
 src/build.cmd                                               | 2 +-
 4 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/src/Authoring/WinRT.SourceGenerator/WinRT.SourceGenerator.csproj b/src/Authoring/WinRT.SourceGenerator/WinRT.SourceGenerator.csproj
index 833b07029..13965c550 100644
--- a/src/Authoring/WinRT.SourceGenerator/WinRT.SourceGenerator.csproj
+++ b/src/Authoring/WinRT.SourceGenerator/WinRT.SourceGenerator.csproj
@@ -18,7 +18,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="3.8.0-4.20472.6" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="3.8.0" PrivateAssets="all" />
     <PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.0" PrivateAssets="all" />    
   </ItemGroup>
 
diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets
index 3620a4af8..f4d0f0cfa 100644
--- a/src/Directory.Build.targets
+++ b/src/Directory.Build.targets
@@ -4,8 +4,6 @@
     <LangVersion>preview</LangVersion>
     <RestoreSources>
       https://api.nuget.org/v3/index.json;
-      https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5/nuget/v3/index.json;
-      https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json;
       https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json;
     </RestoreSources>
   </PropertyGroup>
@@ -21,10 +19,6 @@
     <Compile Condition="'$(GeneratedFilesDir)' != '$(GeneratedFilesRootDir)'" Include="$(GeneratedFilesDir)*.cs" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(MSBuildProjectExtension)' == '.csproj'">
-    <PackageReference Include="Microsoft.Net.Compilers.Toolset" Version="3.8.0-4.20472.6" />
-  </ItemGroup>
-
   <ItemGroup>
     <FrameworkReference Remove="Microsoft.Windows.SDK.NET.Ref" />
   </ItemGroup>
diff --git a/src/Tests/DiagnosticTests/DiagnosticTests.csproj b/src/Tests/DiagnosticTests/DiagnosticTests.csproj
index dd4af04ad..aa19aa2a8 100644
--- a/src/Tests/DiagnosticTests/DiagnosticTests.csproj
+++ b/src/Tests/DiagnosticTests/DiagnosticTests.csproj
@@ -9,7 +9,7 @@
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.16.1" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="3.8.0-4.20472.6" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="3.8.0" PrivateAssets="all" />
     <PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.0" PrivateAssets="all" />    
   </ItemGroup>
 
diff --git a/src/build.cmd b/src/build.cmd
index ef1072617..4d2739ac0 100644
--- a/src/build.cmd
+++ b/src/build.cmd
@@ -1,7 +1,7 @@
 @echo off
 if /i "%cswinrt_echo%" == "on" @echo on
 
-set CsWinRTNet5SdkVersion=5.0.100
+set CsWinRTNet5SdkVersion=5.0.300
 
 set this_dir=%~dp0