Move to 3.0 SDK (#24756)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 21a81b1..641ff94 100644 (file)
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -39,9 +39,9 @@
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
       <Sha>680817355bb2e1326de1124c846263f8d9fb9294</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="1.0.0-beta.19229.8">
+    <Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="1.0.0-beta.19254.1">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>a7a250e9c13147134543c35fef2fb81f19592edf</Sha>
+      <Sha>1b8589bbf53b9a5e819460798eff59830f39a3be</Sha>
     </Dependency>
   </ToolsetDependencies>
 </Dependencies>

diff --git a/eng/Versions.props b/eng/Versions.props
index 1d3c101..98f0ff7 100644 (file)
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -12,7 +12,7 @@
     <!-- Package versions -->
     <MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.19264.13</MicrosoftDotNetXUnitConsoleRunnerVersion>
     <!-- arcade -->
-    <MicrosoftDotNetBuildTasksPackagingVersion>1.0.0-beta.19229.8</MicrosoftDotNetBuildTasksPackagingVersion>
+    <MicrosoftDotNetBuildTasksPackagingVersion>1.0.0-beta.19254.1</MicrosoftDotNetBuildTasksPackagingVersion>
     <!-- corefx -->
     <MicrosoftNetFrameworkReferenceAssembliesVersion>1.0.0-alpha-004</MicrosoftNetFrameworkReferenceAssembliesVersion>
     <MicrosoftPrivateCoreFxNETCoreAppVersion>4.6.0-preview6.19273.8</MicrosoftPrivateCoreFxNETCoreAppVersion>

diff --git a/global.json b/global.json
index 9ea07e5..e94fedf 100644 (file)
--- a/global.json
+++ b/global.json
@@ -1,6 +1,6 @@
 {
   "tools": {
-    "dotnet": "2.1.504"
+    "dotnet": "3.0.100-preview6-011681"
   },
   "native-tools": {
     "cmake": "3.11.1",

diff --git a/tests/runtest.proj b/tests/runtest.proj
index 0e948d9..3f1faa8 100644 (file)
--- a/tests/runtest.proj
+++ b/tests/runtest.proj
@@ -114,11 +114,6 @@ $(_XunitEpilog)
   <ItemGroup>
     <ProjectReference Include="$(SourceDir)Common\Coreclr.TestWrapper\Coreclr.TestWrapper.csproj" />
   </ItemGroup>
-  
-  <ItemGroup>
-    <!-- Workaround for https://github.com/dotnet/core-setup/pull/5893 -->
-    <PackageReference Include="Microsoft.NETCore.App.Internal" Version="$(MicrosoftNETCoreAppVersion)" />
-  </ItemGroup>
 
   <ItemGroup>
     <PackageReference Include="xunit" Version="$(XunitPackageVersion)" />

diff --git a/tests/src/Common/Coreclr.TestWrapper/Coreclr.TestWrapper.csproj b/tests/src/Common/Coreclr.TestWrapper/Coreclr.TestWrapper.csproj
index a42c14c..3af5fe9 100644 (file)
--- a/tests/src/Common/Coreclr.TestWrapper/Coreclr.TestWrapper.csproj
+++ b/tests/src/Common/Coreclr.TestWrapper/Coreclr.TestWrapper.csproj
@@ -11,8 +11,6 @@
 
   <ItemGroup>
     <Compile Include="CoreclrTestWrapperLib.cs" />
-    <!-- Workaround for https://github.com/dotnet/core-setup/pull/5893 -->
-    <PackageReference Include="Microsoft.NETCore.App.Internal" Version="$(MicrosoftNETCoreAppVersion)" />
   </ItemGroup>
 
   <Import Sdk="Microsoft.NET.Sdk" Project="Sdk.targets" />