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/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..5f205046b28 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: '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/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..."