From efa6df25558abd0226ef368c12d2c61cb504c778 Mon Sep 17 00:00:00 2001 From: Rolf Bjarne Kvinge Date: Thu, 25 Feb 2021 08:07:27 +0100 Subject: [PATCH 1/3] Bump .NET version and bump iOS packages. --- README.md | 8 ++++---- azure-pipelines.yml | 6 +++--- global.json | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index a016afec2..4a321917e 100644 --- a/README.md +++ b/README.md @@ -8,8 +8,8 @@ branch. This repo requires a specific build of .NET 6: -* Windows: [dotnet-sdk-6.0.100-preview.1.21103.13-win-x64.exe](https://download.visualstudio.microsoft.com/download/pr/68e6514a-ec0f-46ea-a00a-76ec205c42cc/f68e27ee1a41320ad5e331ccd6bcab9f/dotnet-sdk-6.0.100-preview.1.21103.13-win-x64.exe) -* macOS: [dotnet-sdk-6.0.100-preview.1.21103.13-osx-x64.pkg](https://download.visualstudio.microsoft.com/download/pr/f7224456-9898-45b6-8acc-b110900653cd/817c4e3b1ee787985fdf85032eb2752d/dotnet-sdk-6.0.100-preview.1.21103.13-osx-x64.pkg) +* Windows: [dotnet-sdk-6.0.100-preview.2.21114.3-win-x64.exe](https://dotnetcli.blob.core.windows.net/dotnet/Sdk/6.0.100-preview.2.21114.3/dotnet-sdk-6.0.100-preview.2.21114.3-win-x64.exe) +* macOS: [dotnet-sdk-6.0.100-preview.2.21114.3-osx-x64.pkg](https://dotnetcli.blob.core.windows.net/dotnet/Sdk/6.0.100-preview.2.21114.3/dotnet-sdk-6.0.100-preview.2.21114.3-osx-x64.pkg) You will also need to install builds of the iOS and Android workloads: @@ -24,8 +24,8 @@ These builds are newer than [.NET 6 Preview 1][net6preview1] and require Xcode 12.4. Use downloads from [.NET 6 Preview 1][net6preview1] for Xcode 12.3: -* Windows: [Microsoft.NET.Workload.iOS.14.4.100-ci.main.1100.msi](https://bosstoragemirror.azureedge.net/wrench/main/37831cd0f5105a5df2591553fa0c85ad8d236bad/4483958/package/Microsoft.NET.Workload.iOS.14.4.100-ci.main.1100.msi) -* macOS: [Microsoft.iOS.Bundle.14.4.100-ci.main.1100.pkg](https://bosstoragemirror.azureedge.net/wrench/main/37831cd0f5105a5df2591553fa0c85ad8d236bad/4483958/package/notarized/Microsoft.iOS.Bundle.14.4.100-ci.main.1100.pkg) +* Windows: [Microsoft.NET.Workload.iOS.14.4.100-ci.main.1144.msi](https://bosstoragemirror.blob.core.windows.net/wrench/main/3a69beae5337a1dba3dd2b56c442a6b5ec089429/4505964/package/Microsoft.NET.Workload.iOS.14.4.100-ci.main.1144.msi) +* macOS: [Microsoft.iOS.Bundle.14.4.100-ci.main.1144.pkg](https://bosstoragemirror.blob.core.windows.net/wrench/main/3a69beae5337a1dba3dd2b56c442a6b5ec089429/4505964/package/Microsoft.iOS.Bundle.14.4.100-ci.main.1144.pkg) _NOTE: newer builds of .NET *may* work, but your mileage may vary. The workload installers enable a feature flag file via diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 81d414485..d2ee5d3ab 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -9,12 +9,12 @@ pr: - develop variables: - DotNetVersion: 6.0.100-preview.1.21103.13 + DotNetVersion: 6.0.100-preview.2.21114.3 DotNet.Cli.Telemetry.OptOut: true Android.Msi: https://dl.internalx.com/vsts-devdiv/Xamarin.Android/public/net6/4498522/master/2f83bddb99f6a0948631cd0f09bf037ba8a4e359/Microsoft.NET.Workload.Android.11.0.200.118.msi Android.Pkg: https://dl.internalx.com/vsts-devdiv/Xamarin.Android/public/net6/4498522/master/2f83bddb99f6a0948631cd0f09bf037ba8a4e359/Microsoft.NET.Workload.Android-11.0.200-ci.master.118.pkg - iOS.Msi: https://bosstoragemirror.azureedge.net/wrench/main/37831cd0f5105a5df2591553fa0c85ad8d236bad/4483958/package/Microsoft.NET.Workload.iOS.14.4.100-ci.main.1100.msi - iOS.Pkg: https://bosstoragemirror.azureedge.net/wrench/main/37831cd0f5105a5df2591553fa0c85ad8d236bad/4483958/package/notarized/Microsoft.iOS.Bundle.14.4.100-ci.main.1100.pkg + iOS.Msi: https://bosstoragemirror.azureedge.net/wrench/main/3a69beae5337a1dba3dd2b56c442a6b5ec089429/4505964/package/Microsoft.NET.Workload.iOS.14.4.100-ci.main.1144.msi + iOS.Pkg: https://bosstoragemirror.azureedge.net/wrench/main/3a69beae5337a1dba3dd2b56c442a6b5ec089429/4505964/package/Microsoft.iOS.Bundle.14.4.100-ci.main.1144.pkg jobs: - job: windows diff --git a/global.json b/global.json index fa3f2731f..72f470e97 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "6.0.100-preview.1.21103.13", + "version": "6.0.100-preview.2.21114.3", "rollForward": "disable", "allowPrerelease": true } From 8959134c4424aa4498f0673a43097df9665f0a37 Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Thu, 4 Mar 2021 10:29:41 -0600 Subject: [PATCH 2/3] Bump to Android 11.0.200.136 --- README.md | 4 ++-- azure-pipelines.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 4a321917e..458649405 100644 --- a/README.md +++ b/README.md @@ -15,8 +15,8 @@ You will also need to install builds of the iOS and Android workloads: Android: -* Windows: [Microsoft.NET.Workload.Android.11.0.200.118.msi](https://dl.internalx.com/vsts-devdiv/Xamarin.Android/public/net6/4498522/master/2f83bddb99f6a0948631cd0f09bf037ba8a4e359/Microsoft.NET.Workload.Android.11.0.200.118.msi) -* macOS: [Microsoft.NET.Workload.Android-11.0.200-ci.master.118.pkg](https://dl.internalx.com/vsts-devdiv/Xamarin.Android/public/net6/4498522/master/2f83bddb99f6a0948631cd0f09bf037ba8a4e359/Microsoft.NET.Workload.Android-11.0.200-ci.master.118.pkg) +* Windows: [Microsoft.NET.Workload.Android.11.0.200.136.msi](https://dl.internalx.com/vsts-devdiv/Xamarin.Android/public/net6/4525053/master/8cd0b47032d267a63b449a63c0839c60cbd976f1/Microsoft.NET.Workload.Android.11.0.200.136.msi) +* macOS: [Microsoft.NET.Workload.Android-11.0.200.136.pkg](https://dl.internalx.com/vsts-devdiv/Xamarin.Android/public/net6/4525053/master/8cd0b47032d267a63b449a63c0839c60cbd976f1/Microsoft.NET.Workload.Android-11.0.200-ci.8cd0b47032d267a63b449a63c0839c60cbd976f1.136.pkg) iOS: diff --git a/azure-pipelines.yml b/azure-pipelines.yml index d2ee5d3ab..2aa95e6cf 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -11,8 +11,8 @@ pr: variables: DotNetVersion: 6.0.100-preview.2.21114.3 DotNet.Cli.Telemetry.OptOut: true - Android.Msi: https://dl.internalx.com/vsts-devdiv/Xamarin.Android/public/net6/4498522/master/2f83bddb99f6a0948631cd0f09bf037ba8a4e359/Microsoft.NET.Workload.Android.11.0.200.118.msi - Android.Pkg: https://dl.internalx.com/vsts-devdiv/Xamarin.Android/public/net6/4498522/master/2f83bddb99f6a0948631cd0f09bf037ba8a4e359/Microsoft.NET.Workload.Android-11.0.200-ci.master.118.pkg + Android.Msi: https://dl.internalx.com/vsts-devdiv/Xamarin.Android/public/net6/4525053/master/8cd0b47032d267a63b449a63c0839c60cbd976f1/Microsoft.NET.Workload.Android.11.0.200.136.msi + Android.Pkg: https://dl.internalx.com/vsts-devdiv/Xamarin.Android/public/net6/4525053/master/8cd0b47032d267a63b449a63c0839c60cbd976f1/Microsoft.NET.Workload.Android-11.0.200-ci.8cd0b47032d267a63b449a63c0839c60cbd976f1.136.pkg iOS.Msi: https://bosstoragemirror.azureedge.net/wrench/main/3a69beae5337a1dba3dd2b56c442a6b5ec089429/4505964/package/Microsoft.NET.Workload.iOS.14.4.100-ci.main.1144.msi iOS.Pkg: https://bosstoragemirror.azureedge.net/wrench/main/3a69beae5337a1dba3dd2b56c442a6b5ec089429/4505964/package/Microsoft.iOS.Bundle.14.4.100-ci.main.1144.pkg From da739fc15ff4b804bfa26044112d0eab83d1366f Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Thu, 4 Mar 2021 10:49:26 -0600 Subject: [PATCH 3/3] Bump to iOS 14.4.100-ci.main.1167 --- README.md | 4 ++-- azure-pipelines.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 458649405..54ccb6962 100644 --- a/README.md +++ b/README.md @@ -24,8 +24,8 @@ These builds are newer than [.NET 6 Preview 1][net6preview1] and require Xcode 12.4. Use downloads from [.NET 6 Preview 1][net6preview1] for Xcode 12.3: -* Windows: [Microsoft.NET.Workload.iOS.14.4.100-ci.main.1144.msi](https://bosstoragemirror.blob.core.windows.net/wrench/main/3a69beae5337a1dba3dd2b56c442a6b5ec089429/4505964/package/Microsoft.NET.Workload.iOS.14.4.100-ci.main.1144.msi) -* macOS: [Microsoft.iOS.Bundle.14.4.100-ci.main.1144.pkg](https://bosstoragemirror.blob.core.windows.net/wrench/main/3a69beae5337a1dba3dd2b56c442a6b5ec089429/4505964/package/Microsoft.iOS.Bundle.14.4.100-ci.main.1144.pkg) +* Windows: [Microsoft.NET.Workload.iOS.14.4.100-ci.main.1167.msi](https://bosstoragemirror.azureedge.net/wrench/main/80ed9d81bcf66afa2d800bc362e467180dbf246c/4524716/package/Microsoft.NET.Workload.iOS.14.4.100-ci.main.1167.msi) +* macOS: [Microsoft.iOS.Bundle.14.4.100-ci.main.1167.pkg](https://bosstoragemirror.azureedge.net/wrench/main/80ed9d81bcf66afa2d800bc362e467180dbf246c/4524716/package/notarized/Microsoft.iOS.Bundle.14.4.100-ci.main.1167.pkg) _NOTE: newer builds of .NET *may* work, but your mileage may vary. The workload installers enable a feature flag file via diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 2aa95e6cf..2fea78fbc 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -13,8 +13,8 @@ variables: DotNet.Cli.Telemetry.OptOut: true Android.Msi: https://dl.internalx.com/vsts-devdiv/Xamarin.Android/public/net6/4525053/master/8cd0b47032d267a63b449a63c0839c60cbd976f1/Microsoft.NET.Workload.Android.11.0.200.136.msi Android.Pkg: https://dl.internalx.com/vsts-devdiv/Xamarin.Android/public/net6/4525053/master/8cd0b47032d267a63b449a63c0839c60cbd976f1/Microsoft.NET.Workload.Android-11.0.200-ci.8cd0b47032d267a63b449a63c0839c60cbd976f1.136.pkg - iOS.Msi: https://bosstoragemirror.azureedge.net/wrench/main/3a69beae5337a1dba3dd2b56c442a6b5ec089429/4505964/package/Microsoft.NET.Workload.iOS.14.4.100-ci.main.1144.msi - iOS.Pkg: https://bosstoragemirror.azureedge.net/wrench/main/3a69beae5337a1dba3dd2b56c442a6b5ec089429/4505964/package/Microsoft.iOS.Bundle.14.4.100-ci.main.1144.pkg + iOS.Msi: https://bosstoragemirror.azureedge.net/wrench/main/80ed9d81bcf66afa2d800bc362e467180dbf246c/4524716/package/Microsoft.NET.Workload.iOS.14.4.100-ci.main.1167.msi + iOS.Pkg: https://bosstoragemirror.azureedge.net/wrench/main/80ed9d81bcf66afa2d800bc362e467180dbf246c/4524716/package/notarized/Microsoft.iOS.Bundle.14.4.100-ci.main.1167.pkg jobs: - job: windows