From 9402ec958d8950195176fcd1826a115f27c1b7bb Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Wed, 7 Jun 2023 17:53:48 +0200 Subject: [PATCH 1/4] Use the new .NET SDK and tools --- .config/dotnet-tools.json | 2 +- global.json | 5 +++++ nuget.config | 3 +-- scripts/azure-pipelines-variables.yml | 6 +++--- scripts/azure-templates-bootstrapper.yml | 4 ++-- scripts/install-dotnet-workloads.ps1 | 21 +++++++++------------ scripts/install-vs.ps1 | 4 +++- 7 files changed, 24 insertions(+), 21 deletions(-) create mode 100644 global.json diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index d10ef3d8870..c4ec4ffc7a2 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -21,7 +21,7 @@ ] }, "microsoft.dotnet.xharness.cli": { - "version": "1.0.0-prerelease.22204.2", + "version": "8.0.0-prerelease.23307.1", "commands": [ "xharness" ] diff --git a/global.json b/global.json new file mode 100644 index 00000000000..2d46182cf40 --- /dev/null +++ b/global.json @@ -0,0 +1,5 @@ +{ + "sdk": { + "version": "7.0.302" + } +} \ No newline at end of file diff --git a/nuget.config b/nuget.config index cf0d53d78d9..4de57ae8006 100644 --- a/nuget.config +++ b/nuget.config @@ -2,11 +2,10 @@ - - + diff --git a/scripts/azure-pipelines-variables.yml b/scripts/azure-pipelines-variables.yml index 994b1d6617b..3ace225bb2c 100644 --- a/scripts/azure-pipelines-variables.yml +++ b/scripts/azure-pipelines-variables.yml @@ -14,9 +14,9 @@ variables: MONO_VERSION_MACOS: '6_12_13' MONO_VERSION_LINUX: 'stable-focal/snapshots/6.12.0.182' XCODE_VERSION: 13.2.1 - VISUAL_STUDIO_VERSION: '17/pre' - DOTNET_VERSION_PREVIEW: '6.0.403' - DOTNET_WORKLOAD_SOURCE: 'https://maui.blob.core.windows.net/metadata/rollbacks/6.0.547.json' + VISUAL_STUDIO_VERSION: '' + DOTNET_VERSION_PREVIEW: '7.0.302' + DOTNET_WORKLOAD_SOURCE: 'https://maui.blob.core.windows.net/metadata/rollbacks/7.0.86.json' CONFIGURATION: 'Release' DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true THROW_ON_TEST_FAILURE: true diff --git a/scripts/azure-templates-bootstrapper.yml b/scripts/azure-templates-bootstrapper.yml index 786ecb49be8..5ca1da317f6 100644 --- a/scripts/azure-templates-bootstrapper.yml +++ b/scripts/azure-templates-bootstrapper.yml @@ -178,9 +178,9 @@ jobs: condition: and(succeeded(), eq(variables['DOWNLOAD_EXTERNALS'], '')) inputs: packageType: 'sdk' - version: 6.0.x + version: 7.0.x retryCountOnTaskFailure: 3 - displayName: Install .NET Core 6.0.x + displayName: Install .NET Core 7.0.x - pwsh: .\scripts\install-dotnet.ps1 -Version $env:DOTNET_VERSION_PREVIEW -InstallDir "$env:AGENT_TOOLSDIRECTORY/dotnet" displayName: Install the preview version of .NET Core retryCountOnTaskFailure: 3 diff --git a/scripts/install-dotnet-workloads.ps1 b/scripts/install-dotnet-workloads.ps1 index 8248c7f0349..e18d2c65a2c 100644 --- a/scripts/install-dotnet-workloads.ps1 +++ b/scripts/install-dotnet-workloads.ps1 @@ -6,15 +6,13 @@ Param( $ErrorActionPreference = 'Stop' -$previewFeed = 'https://api.nuget.org/v3/index.json' -$previewNextFeed = 'https://api.nuget.org/v3/index.json' -$previewRuntime = 'https://api.nuget.org/v3/index.json' -$previewEmscripten = 'https://api.nuget.org/v3/index.json' +$feed1 = 'https://api.nuget.org/v3/index.json' +$feed2 = 'https://api.nuget.org/v3/index.json' +$feed3 = 'https://api.nuget.org/v3/index.json' if ($IsPreview) { - $previewFeed = 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json' - $previewNextFeed = 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet7/nuget/v3/index.json' - $previewRuntime = 'https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-531f715f/nuget/v3/index.json' - $previewEmscripten = 'https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-3f6c45a2/nuget/v3/index.json' + $feed1 = 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json' + $feed2 = 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet7/nuget/v3/index.json' + $feed3 = 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet8/nuget/v3/index.json' } Write-Host "Installing .NET workloads..." @@ -22,10 +20,9 @@ Write-Host "Installing .NET workloads..." android ios tvos macos maccatalyst wasm-tools maui ` --from-rollback-file $SourceUrl ` --source https://api.nuget.org/v3/index.json ` - --source $previewFeed ` - --source $previewNextFeed ` - --source $previewRuntime ` - --source $previewEmscripten ` + --source $feed1 ` + --source $feed2 ` + --source $feed3 ` --skip-sign-check Write-Host "Installing Tizen workloads..." diff --git a/scripts/install-vs.ps1 b/scripts/install-vs.ps1 index 485a3b26f6a..9a553d9ef0e 100644 --- a/scripts/install-vs.ps1 +++ b/scripts/install-vs.ps1 @@ -43,7 +43,6 @@ Write-Host "Installing Visual Studio..." $exitCode = & "$temp\dd_vs_community.exe" --quiet --norestart --wait ` --includeRecommended ` --add Microsoft.VisualStudio.Workload.NetCrossPlat ` - --add Microsoft.VisualStudio.Workload.NetCoreTools ` --add Microsoft.VisualStudio.Workload.ManagedDesktop ` --add Microsoft.VisualStudio.Workload.Universal ` | Out-Null @@ -55,5 +54,8 @@ New-Item -ItemType Directory -Force -Path "$vsLogs" | Out-Null Get-ChildItem "$temp\dd_*" | Where-Object { $_.CreationTime -gt $startTime } | Copy-Item -Destination "$vsLogs" +Get-ChildItem "$env:TEMP\dd_*" | + Where-Object { $_.CreationTime -gt $startTime } | + Copy-Item -Destination "$vsLogs" exit $LASTEXITCODE From 08155b53ecb07f6110ad538656bda31277151592 Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Wed, 7 Jun 2023 17:57:06 +0200 Subject: [PATCH 2/4] Revert "Use the new .NET SDK and tools" This reverts commit 9402ec958d8950195176fcd1826a115f27c1b7bb. --- scripts/azure-pipelines-variables.yml | 4 ++-- scripts/azure-templates-bootstrapper.yml | 4 ++-- scripts/install-vs.ps1 | 4 +--- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/scripts/azure-pipelines-variables.yml b/scripts/azure-pipelines-variables.yml index 3ace225bb2c..5f205046b28 100644 --- a/scripts/azure-pipelines-variables.yml +++ b/scripts/azure-pipelines-variables.yml @@ -15,8 +15,8 @@ variables: MONO_VERSION_LINUX: 'stable-focal/snapshots/6.12.0.182' XCODE_VERSION: 13.2.1 VISUAL_STUDIO_VERSION: '' - DOTNET_VERSION_PREVIEW: '7.0.302' - DOTNET_WORKLOAD_SOURCE: 'https://maui.blob.core.windows.net/metadata/rollbacks/7.0.86.json' + DOTNET_VERSION_PREVIEW: '6.0.408' + DOTNET_WORKLOAD_SOURCE: 'https://maui.blob.core.windows.net/metadata/rollbacks/6.0.553.json' CONFIGURATION: 'Release' DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true THROW_ON_TEST_FAILURE: true diff --git a/scripts/azure-templates-bootstrapper.yml b/scripts/azure-templates-bootstrapper.yml index 5ca1da317f6..786ecb49be8 100644 --- a/scripts/azure-templates-bootstrapper.yml +++ b/scripts/azure-templates-bootstrapper.yml @@ -178,9 +178,9 @@ jobs: condition: and(succeeded(), eq(variables['DOWNLOAD_EXTERNALS'], '')) inputs: packageType: 'sdk' - version: 7.0.x + version: 6.0.x retryCountOnTaskFailure: 3 - displayName: Install .NET Core 7.0.x + displayName: Install .NET Core 6.0.x - pwsh: .\scripts\install-dotnet.ps1 -Version $env:DOTNET_VERSION_PREVIEW -InstallDir "$env:AGENT_TOOLSDIRECTORY/dotnet" displayName: Install the preview version of .NET Core retryCountOnTaskFailure: 3 diff --git a/scripts/install-vs.ps1 b/scripts/install-vs.ps1 index 9a553d9ef0e..485a3b26f6a 100644 --- a/scripts/install-vs.ps1 +++ b/scripts/install-vs.ps1 @@ -43,6 +43,7 @@ Write-Host "Installing Visual Studio..." $exitCode = & "$temp\dd_vs_community.exe" --quiet --norestart --wait ` --includeRecommended ` --add Microsoft.VisualStudio.Workload.NetCrossPlat ` + --add Microsoft.VisualStudio.Workload.NetCoreTools ` --add Microsoft.VisualStudio.Workload.ManagedDesktop ` --add Microsoft.VisualStudio.Workload.Universal ` | Out-Null @@ -54,8 +55,5 @@ New-Item -ItemType Directory -Force -Path "$vsLogs" | Out-Null Get-ChildItem "$temp\dd_*" | Where-Object { $_.CreationTime -gt $startTime } | Copy-Item -Destination "$vsLogs" -Get-ChildItem "$env:TEMP\dd_*" | - Where-Object { $_.CreationTime -gt $startTime } | - Copy-Item -Destination "$vsLogs" exit $LASTEXITCODE From 1a228ed49d043b169b36b11406ce3d7d9afd1246 Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Wed, 7 Jun 2023 18:06:58 +0200 Subject: [PATCH 3/4] asdf --- global.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/global.json b/global.json index 2d46182cf40..dfa39aa9ede 100644 --- a/global.json +++ b/global.json @@ -1,5 +1,5 @@ { "sdk": { - "version": "7.0.302" + "version": "6.0.408" } } \ No newline at end of file From c47ab9b8a439f6786dabb5b6d6cf2dbff74b477d Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Wed, 7 Jun 2023 18:15:33 +0200 Subject: [PATCH 4/4] remove htis --- global.json | 5 ----- 1 file changed, 5 deletions(-) delete mode 100644 global.json diff --git a/global.json b/global.json deleted file mode 100644 index dfa39aa9ede..00000000000 --- a/global.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "sdk": { - "version": "6.0.408" - } -} \ No newline at end of file