Merge pull request #694 from JoeRobich/run-on-latest

Always run on the latest Runtime
dotnet · Jun 1, 2020 · f691ea2 · f691ea2
2 parents 686fc1e + e6c1b57
commit f691ea2
Show file tree

Hide file tree

Showing 7 changed files with 29 additions and 64 deletions.
diff --git a/azure-pipelines-integration.yml b/azure-pipelines-integration.yml
@@ -19,35 +19,35 @@ jobs:
       format:
         _repo: "https://github.com/dotnet/format"
         _repoName: "dotnet/format"
-        _sha: "4ff73616469a2aaa5ff07d11b7f6951eca83d76e"
+        _sha: "686fc1efbe07d0a2d47147e36677ffcb09a74edc"
       roslyn:
         _repo: "https://github.com/dotnet/roslyn"
         _repoName: "dotnet/roslyn"
-        _sha: "1bd191ea896b19e3b06a152f815f3a998e87049a"
-      cli:
-        _repo: "https://github.com/dotnet/cli"
-        _repoName: "dotnet/cli"
-        _sha: "45f1c5f7f3275ff483c804e7c90bf61731a83e97"
+        _sha: "686fc1efbe07d0a2d47147e36677ffcb09a74edc"
+      sdk:
+        _repo: "https://github.com/dotnet/sdk"
+        _repoName: "dotnet/sdk"
+        _sha: "d03f6695c294a7c0dd4d46a292e650b7a6f6b667"
       project-system:
         _repo: "https://github.com/dotnet/project-system"
         _repoName: "dotnet/project-system"
-        _sha: "fc3b12e47adaad6e4813dc600acf190156fecc24"
+        _sha: "e7baa11d85b75c1871e866c240ca4aa4240d7818"
       msbuild:
         _repo: "https://github.com/Microsoft/msbuild"
         _repoName: "Microsoft/msbuild"
-        _sha: "e92633a735b0e23e2cbf818d02ba89dd7a426f89"
-      Blazor:
-        _repo: "https://github.com/aspnet/Blazor"
-        _repoName: "aspnet/Blazor"
-        _sha: "7eeab316fa122b69a9bd777c93dcc78bc6a68905"
-      EntityFrameworkCore:
-        _repo: "https://github.com/aspnet/EntityFrameworkCore"
-        _repoName: "aspnet/EntityFrameworkCore"
-        _sha: "94f5bdf081f9a774f5d7f01bfa279bac26dab303"
-      EntityFramework6:
-        _repo: "https://github.com/aspnet/EntityFramework6"
-        _repoName: "aspnet/EntityFramework6"
-        _sha: "9099ad2f6e5936ecdf549f88394b5a59fa75c869"
+        _sha: "a936b97e30679dcea4d99c362efa6f732c9d3587"
+      blazor:
+        _repo: "https://github.com/aspnet/blazor"
+        _repoName: "aspnet/blazor"
+        _sha: "cc449601d638ffaab58ae9487f0fd010bb178a12"
+      efcore:
+        _repo: "https://github.com/dotnet/efcore"
+        _repoName: "dotnet/efcore"
+        _sha: "0afeb9279ca72d0a5aa6738adf902fe6a30ba5c4"
+      ef6:
+        _repo: "https://github.com/dotnet/ef6"
+        _repoName: "dotnet/ef6"
+        _sha: "603c30382a5aec6677b4d90043694ac412cbb426"
   timeoutInMinutes: 20
   steps:
     - script: eng\integration-test.cmd -repo '$(_repo)' -sha '$(_sha)' -testPath '$(Build.SourcesDirectory)\temp' -stage 'prepare'

diff --git a/eng/format-verifier.ps1 b/eng/format-verifier.ps1
@@ -67,7 +67,8 @@ try {
 
                 if (($output -notmatch "(?m)Formatted \d+ of (\d+) files") -or ($Matches[1] -eq "0")) {
                     Write-Output "$(Get-Date) - No files found for solution."
-                    exit -1
+                    # The dotnet/sdk has a toolset solution with no files.
+                    # exit -1
                 }
             }
 

diff --git a/eng/restore-toolset.ps1 b/eng/restore-toolset.ps1
diff --git a/src/dotnet-format.csproj b/src/dotnet-format.csproj
@@ -12,6 +12,9 @@
 
     <Description>Command line tool for formatting C# and Visual Basic code files based on .editorconfig settings.</Description>
 
+    <!-- Always run on the latest runtime installed. -->
+    <RollForward>LatestMajor</RollForward>
+
     <IsPackable>true</IsPackable>
     <PackAsTool>true</PackAsTool>
     <PackageIcon>packageicon.png</PackageIcon>

diff --git a/src/runtimeconfig.template.json b/src/runtimeconfig.template.json
diff --git a/tests/dotnet-format.UnitTests.csproj b/tests/dotnet-format.UnitTests.csproj
@@ -1,10 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>netcoreapp2.1</TargetFramework>
     <LangVersion>8.0</LangVersion>
     <IsPackable>false</IsPackable>
     <RootNamespace>Microsoft.CodeAnalysis.Tools.Tests</RootNamespace>
+
+    <!-- Always run on the latest runtime installed. -->
+    <RollForward>LatestMajor</RollForward>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/tests/runtimeconfig.template.json b/tests/runtimeconfig.template.json