From 5e088ef095f7aab3cde2770f8bc783a23d2d19ad Mon Sep 17 00:00:00 2001 From: Jonathan Pobst Date: Thu, 2 Nov 2023 12:18:39 -1000 Subject: [PATCH 1/3] Begin building `net7.0-android` TF. --- Directory.Build.props | 5 ++++- workloads.json | 18 ++++++++++-------- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index e9eb5bc49..1201c05a3 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -6,7 +6,7 @@ $(BUILD_SOURCEVERSION) - <_DefaultTargetFrameworks>MonoAndroid12.0;net6.0-android + <_DefaultTargetFrameworks>MonoAndroid12.0;net6.0-android;net7.0-android true @@ -43,14 +43,17 @@ + + + diff --git a/workloads.json b/workloads.json index cc695a94a..b21339253 100644 --- a/workloads.json +++ b/workloads.json @@ -1,10 +1,12 @@ { - "microsoft.net.sdk.android": "32.0.485/6.0.400", - "microsoft.net.sdk.ios": "16.2.19/6.0.400", - "microsoft.net.sdk.maccatalyst": "16.2.19/6.0.400", - "microsoft.net.sdk.macos": "13.1.19/6.0.400", - "microsoft.net.sdk.tvos": "16.1.257/6.0.400", - "microsoft.net.sdk.maui": "6.0.552/6.0.400", - "microsoft.net.workload.mono.toolchain": "6.0.15/6.0.400", - "microsoft.net.workload.emscripten": "6.0.15/6.0.400" + "microsoft.net.sdk.android": "33.0.95/7.0.100", + "microsoft.net.sdk.ios": "16.4.7090/7.0.100", + "microsoft.net.sdk.maccatalyst": "16.4.7090/7.0.100", + "microsoft.net.sdk.macos": "13.3.7090/7.0.100", + "microsoft.net.sdk.maui": "7.0.92/7.0.100", + "microsoft.net.sdk.tvos": "16.4.7090/7.0.100", + "microsoft.net.workload.mono.toolchain.net6": "7.0.10/7.0.100", + "microsoft.net.workload.mono.toolchain.net7": "7.0.10/7.0.100", + "microsoft.net.workload.emscripten.net6": "7.0.10/7.0.100", + "microsoft.net.workload.emscripten.net7": "7.0.10/7.0.100" } \ No newline at end of file From 0f2d079514e7d9098ba4d10839f08691b1e6e49a Mon Sep 17 00:00:00 2001 From: Jonathan Pobst Date: Thu, 2 Nov 2023 12:18:39 -1000 Subject: [PATCH 2/3] Begin building `net7.0-android` TF. --- Directory.Build.props | 5 ++++- build/ci/build.yml | 2 +- global.json | 2 +- .../BuildAllDotNet/BuildAllDotNet.csproj | 2 +- .../BuildAllMauiApp/BuildAllMauiApp.csproj | 2 +- workloads.json | 18 ++++++++++-------- 6 files changed, 18 insertions(+), 13 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index e9eb5bc49..1201c05a3 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -6,7 +6,7 @@ $(BUILD_SOURCEVERSION) - <_DefaultTargetFrameworks>MonoAndroid12.0;net6.0-android + <_DefaultTargetFrameworks>MonoAndroid12.0;net6.0-android;net7.0-android true @@ -43,14 +43,17 @@ + + + diff --git a/build/ci/build.yml b/build/ci/build.yml index 04cc1c65b..40cdbbee0 100644 --- a/build/ci/build.yml +++ b/build/ci/build.yml @@ -9,7 +9,7 @@ parameters: windowsImage: 'windows-latest' # the name of the Windows VM image # Tool Parameters - dotnetVersion: '7.0.306' # the version of .NET to use + dotnetVersion: '7.0.403' # the version of .NET to use dotnetWorkloadRollbackFile: 'workloads.json' dotnetWorkloadSource: 'https://aka.ms/dotnet6/nuget/index.json' dotnetNuGetOrgSource: 'https://api.nuget.org/v3/index.json' diff --git a/global.json b/global.json index 323281446..ff661818b 100644 --- a/global.json +++ b/global.json @@ -1,7 +1,7 @@ { "sdk": { - "version": "7.0.306", + "version": "7.0.403", "rollForward": "patch" }, "msbuild-sdks": diff --git a/samples/dotnet/BuildAllDotNet/BuildAllDotNet.csproj b/samples/dotnet/BuildAllDotNet/BuildAllDotNet.csproj index 51df5bad9..b05848115 100644 --- a/samples/dotnet/BuildAllDotNet/BuildAllDotNet.csproj +++ b/samples/dotnet/BuildAllDotNet/BuildAllDotNet.csproj @@ -1,7 +1,7 @@ - net6.0-android + net6.0-android;net7.0-android 28 diff --git a/samples/dotnet/BuildAllMauiApp/BuildAllMauiApp.csproj b/samples/dotnet/BuildAllMauiApp/BuildAllMauiApp.csproj index 2208445fa..5371604fc 100644 --- a/samples/dotnet/BuildAllMauiApp/BuildAllMauiApp.csproj +++ b/samples/dotnet/BuildAllMauiApp/BuildAllMauiApp.csproj @@ -1,7 +1,7 @@  - net6.0-android + net6.0-android;net7.0-android Exe BuildAllMauiApp true diff --git a/workloads.json b/workloads.json index cc695a94a..b21339253 100644 --- a/workloads.json +++ b/workloads.json @@ -1,10 +1,12 @@ { - "microsoft.net.sdk.android": "32.0.485/6.0.400", - "microsoft.net.sdk.ios": "16.2.19/6.0.400", - "microsoft.net.sdk.maccatalyst": "16.2.19/6.0.400", - "microsoft.net.sdk.macos": "13.1.19/6.0.400", - "microsoft.net.sdk.tvos": "16.1.257/6.0.400", - "microsoft.net.sdk.maui": "6.0.552/6.0.400", - "microsoft.net.workload.mono.toolchain": "6.0.15/6.0.400", - "microsoft.net.workload.emscripten": "6.0.15/6.0.400" + "microsoft.net.sdk.android": "33.0.95/7.0.100", + "microsoft.net.sdk.ios": "16.4.7090/7.0.100", + "microsoft.net.sdk.maccatalyst": "16.4.7090/7.0.100", + "microsoft.net.sdk.macos": "13.3.7090/7.0.100", + "microsoft.net.sdk.maui": "7.0.92/7.0.100", + "microsoft.net.sdk.tvos": "16.4.7090/7.0.100", + "microsoft.net.workload.mono.toolchain.net6": "7.0.10/7.0.100", + "microsoft.net.workload.mono.toolchain.net7": "7.0.10/7.0.100", + "microsoft.net.workload.emscripten.net6": "7.0.10/7.0.100", + "microsoft.net.workload.emscripten.net7": "7.0.10/7.0.100" } \ No newline at end of file From 36bf1392167845939e92f030115cb8d9a3b79c0d Mon Sep 17 00:00:00 2001 From: Jonathan Pobst Date: Tue, 7 Nov 2023 11:13:45 -1000 Subject: [PATCH 3/3] TargetFramework -> TargetFrameworks --- samples/dotnet/BuildAllDotNet/BuildAllDotNet.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/dotnet/BuildAllDotNet/BuildAllDotNet.csproj b/samples/dotnet/BuildAllDotNet/BuildAllDotNet.csproj index b05848115..348962575 100644 --- a/samples/dotnet/BuildAllDotNet/BuildAllDotNet.csproj +++ b/samples/dotnet/BuildAllDotNet/BuildAllDotNet.csproj @@ -1,7 +1,7 @@ - net6.0-android;net7.0-android + net6.0-android;net7.0-android 28