Use RTM version of the SDK (#19130)
This commit is contained in:
parent
1dfbe75e9f
commit
ffc7279369
|
|
@ -10,7 +10,6 @@
|
||||||
<add key="darc-pub-dotnet-aspnetcore-tooling-2dab42e" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-aspnetcore-tooling-2dab42e1/nuget/v3/index.json" />
|
<add key="darc-pub-dotnet-aspnetcore-tooling-2dab42e" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-aspnetcore-tooling-2dab42e1/nuget/v3/index.json" />
|
||||||
<add key="darc-pub-aspnet-Extensions-1286a6f" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-aspnet-Extensions-1286a6ff/nuget/v3/index.json" />
|
<add key="darc-pub-aspnet-Extensions-1286a6f" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-aspnet-Extensions-1286a6ff/nuget/v3/index.json" />
|
||||||
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
|
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
|
||||||
<add key="aspnetcore" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/3.1.102-servicing-014873/nuget/v3/index.json" />
|
|
||||||
<add key="dotnet-core" value="https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json" />
|
<add key="dotnet-core" value="https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json" />
|
||||||
<add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" />
|
<add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" />
|
||||||
<add key="aspnet-blazor" value="https://dotnetfeed.blob.core.windows.net/aspnet-blazor/index.json" />
|
<add key="aspnet-blazor" value="https://dotnetfeed.blob.core.windows.net/aspnet-blazor/index.json" />
|
||||||
|
|
|
||||||
|
|
@ -362,12 +362,6 @@ try {
|
||||||
|
|
||||||
$toolsetBuildProj = InitializeToolset
|
$toolsetBuildProj = InitializeToolset
|
||||||
|
|
||||||
$dotnetInstallDir = Join-Path $RepoRoot ".dotnet"
|
|
||||||
$sdkPath = [IO.Path]::Combine($dotnetInstallDir, 'sdk', '3.1.102')
|
|
||||||
if (!(Test-Path $sdkPath)) {
|
|
||||||
InstallDotNetSdk $dotnetInstallDir '3.1.102-servicing-014873' -skipNonVersionedFiles $true
|
|
||||||
}
|
|
||||||
|
|
||||||
$restore = $tmpRestore
|
$restore = $tmpRestore
|
||||||
|
|
||||||
if ($ci) {
|
if ($ci) {
|
||||||
|
|
|
||||||
5
build.sh
5
build.sh
|
|
@ -316,11 +316,6 @@ restore=true
|
||||||
|
|
||||||
InitializeToolset
|
InitializeToolset
|
||||||
|
|
||||||
dotnet_install_dir="$repo_root/.dotnet"
|
|
||||||
if [[ ! -d "$dotnet_install_dir/sdk/3.1.102" ]]; then
|
|
||||||
InstallDotNetSdk "$dotnet_install_dir" "3.1.102-servicing-014873"
|
|
||||||
fi
|
|
||||||
|
|
||||||
restore=$_tmp_restore=
|
restore=$_tmp_restore=
|
||||||
|
|
||||||
if [ "$build_repo_tasks" = true ]; then
|
if [ "$build_repo_tasks" = true ]; then
|
||||||
|
|
|
||||||
|
|
@ -1,9 +1,9 @@
|
||||||
{
|
{
|
||||||
"sdk": {
|
"sdk": {
|
||||||
"version": "3.1.101"
|
"version": "3.1.102"
|
||||||
},
|
},
|
||||||
"tools": {
|
"tools": {
|
||||||
"dotnet": "3.1.101",
|
"dotnet": "3.1.102",
|
||||||
"runtimes": {
|
"runtimes": {
|
||||||
"dotnet/x64": [
|
"dotnet/x64": [
|
||||||
"$(MicrosoftNETCoreAppInternalPackageVersion)"
|
"$(MicrosoftNETCoreAppInternalPackageVersion)"
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue