diff options
| author | Sven Boemer <sbomer@gmail.com> | 2022-08-09 21:54:13 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-09 21:54:13 +0300 |
| commit | fe3a96424d28fb5b1eee4ca8c7e1713aa37247a4 (patch) | |
| tree | 52044c9b221da1c79575f0d4d991eff77cc25e5f | |
| parent | d439a37eb1c4c69903f6863e838f89b69f993de2 (diff) | |
Build with preview5 SDK (#2954)
dede5f58dc9b7296de884ed62688b35d5b154b78 didn't fix the dependency
flow, because the packages for some reason are still being produced
with a preview7 in the runtimeconfig. Lacking better workarounds, this
change builds with the preview5 SDK that was selected in #2884 before
we decided to update to preview7 (due to a dotnet-format bug). This
disables the lint job to prevent those failures. We should turn it
back on once we can use preview7 (once dotnet/runtime and dotnet/sdk
are on preview7).
| -rw-r--r-- | eng/azure-pipelines.yml | 4 | ||||
| -rw-r--r-- | global.json | 4 | ||||
| -rw-r--r-- | src/linker/Mono.Linker.csproj | 5 |
3 files changed, 5 insertions, 8 deletions
diff --git a/eng/azure-pipelines.yml b/eng/azure-pipelines.yml index 6c555ca49..35c0deff9 100644 --- a/eng/azure-pipelines.yml +++ b/eng/azure-pipelines.yml @@ -145,7 +145,9 @@ stages: steps: - checkout: self submodules: true - - script: ./lint.sh --verify-no-changes --verbosity diagnostic + # Disabled to prevent dotnet-format bugs (see https://github.com/dotnet/linker/pull/2884). + # This should be turned back on when we are on a preview7 SDK. + # - script: ./lint.sh --verify-no-changes --verbosity diagnostic # Post-Build Arcade logic - ${{ if eq(variables.officialBuild, 'true') }}: diff --git a/global.json b/global.json index 73b7d6c74..022acf4cb 100644 --- a/global.json +++ b/global.json @@ -1,11 +1,11 @@ { "sdk": { - "version": "7.0.100-preview.7.22377.5", + "version": "7.0.100-preview.5.22307.18", "allowPrerelease": true, "rollForward": "major" }, "tools": { - "dotnet": "7.0.100-preview.7.22377.5", + "dotnet": "7.0.100-preview.5.22307.18", "xcopy-msbuild": "17.2.1" }, "msbuild-sdks": { diff --git a/src/linker/Mono.Linker.csproj b/src/linker/Mono.Linker.csproj index 4bb8e0758..6e6b5a002 100644 --- a/src/linker/Mono.Linker.csproj +++ b/src/linker/Mono.Linker.csproj @@ -3,11 +3,6 @@ <PropertyGroup> <OutputType>Exe</OutputType> <ServerGarbageCollection>true</ServerGarbageCollection> - <!-- Pick a RuntimeFrameworkVersion at least as low as the DefaultRuntimeFrameworkVersion - of the SDK used by dotnet/runtime and dotnet/sdk, to ensure that the runtimeconfig.json - specifies a version available in those repos. This can be removed once they catch up to - the SDK version in our global.json. --> - <RuntimeFrameworkVersion>7.0.0-preview.5.22301.12</RuntimeFrameworkVersion> </PropertyGroup> <PropertyGroup> |