diff --git a/azure-pipelines-integration.yml b/azure-pipelines-integration.yml
index 729e38006b..4c25d3df5b 100644
--- 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
index 1b76388f4b..665c949226 100644
--- 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
deleted file mode 100644
index f393522714..0000000000
--- a/eng/restore-toolset.ps1
+++ /dev/null
@@ -1,36 +0,0 @@
-function InitializeCustomSDKToolset {
- if (-not $restore) {
- return
- }
-
- # Turn off MSBuild Node re-use
- $env:MSBUILDDISABLENODEREUSE=1
-
- # Workaround for the sockets issue when restoring with many nuget feeds.
- $env:DOTNET_SYSTEM_NET_HTTP_USESOCKETSHTTPHANDLER=0
-
- # Enable vs test console logging
- $env:VSTEST_BUILD_TRACE=1
- $env:VSTEST_TRACE_BUILD=1
-
- $env:DOTNET_CLI_TELEMETRY_PROFILE='$env:DOTNET_CLI_TELEMETRY_PROFILE;https://github.com/dotnet/format'
-
- $cli = InitializeDotnetCli -install:$true
- InstallDotNetSharedFramework "2.1.15"
- }
-
- function InstallDotNetSharedFramework([string]$version) {
- $dotnetRoot = $env:DOTNET_INSTALL_DIR
- $fxDir = Join-Path $dotnetRoot "shared\Microsoft.NETCore.App\$version"
-
- if (!(Test-Path $fxDir)) {
- $installScript = GetDotNetInstallScript $dotnetRoot
- & $installScript -Version $version -InstallDir $dotnetRoot -Runtime "dotnet"
-
- if($lastExitCode -ne 0) {
- Write-Output "Failed to install Shared Framework $version. Ignoring failure as not all distros carrie all versions of the framework."
- }
- }
- }
-
- InitializeCustomSDKToolset
\ No newline at end of file
diff --git a/src/dotnet-format.csproj b/src/dotnet-format.csproj
index ef450fb7e1..1d64022071 100644
--- a/src/dotnet-format.csproj
+++ b/src/dotnet-format.csproj
@@ -12,6 +12,9 @@
Command line tool for formatting C# and Visual Basic code files based on .editorconfig settings.
+
+ LatestMajor
+
true
true
packageicon.png
diff --git a/src/runtimeconfig.template.json b/src/runtimeconfig.template.json
deleted file mode 100644
index f022b7ffce..0000000000
--- a/src/runtimeconfig.template.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
- "rollForwardOnNoCandidateFx": 2
-}
\ No newline at end of file
diff --git a/tests/dotnet-format.UnitTests.csproj b/tests/dotnet-format.UnitTests.csproj
index a20cdcfc0c..75cf04bc3c 100644
--- a/tests/dotnet-format.UnitTests.csproj
+++ b/tests/dotnet-format.UnitTests.csproj
@@ -1,10 +1,13 @@
- netcoreapp3.0
+ netcoreapp2.1
8.0
false
Microsoft.CodeAnalysis.Tools.Tests
+
+
+ LatestMajor
diff --git a/tests/runtimeconfig.template.json b/tests/runtimeconfig.template.json
deleted file mode 100644
index f022b7ffce..0000000000
--- a/tests/runtimeconfig.template.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
- "rollForwardOnNoCandidateFx": 2
-}
\ No newline at end of file