diff --git a/Directory.Build.props b/Directory.Build.props index 24a7ba52f2eb..0543ceb45135 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -2,7 +2,7 @@ - <_MauiDotNetVersionMajor Condition="'$(_MauiDotNetVersionMajor)' == ''">7 + <_MauiDotNetVersionMajor Condition="'$(_MauiDotNetVersionMajor)' == ''">8 <_MauiDotNetVersionMinor Condition="'$(_MauiDotNetVersionMinor)' == ''">0 <_MauiDotNetVersion Condition="'$(_MauiDotNetVersion)' == ''">$(_MauiDotNetVersionMajor).$(_MauiDotNetVersionMinor) <_MauiDotNetTfm Condition="'$(_MauiDotNetTfm)' == ''">net$(_MauiDotNetVersion) @@ -157,5 +157,7 @@ true true + + false diff --git a/GitInfo.txt b/GitInfo.txt index 2f424f8bc1ca..ff5ec35d5666 100644 --- a/GitInfo.txt +++ b/GitInfo.txt @@ -1 +1 @@ -7.0.0-ci.net7 +8.0.0-ci.net8 diff --git a/NuGet.config b/NuGet.config index cf67e711c6be..aad39263ca7b 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,11 +4,8 @@ - - - @@ -20,6 +17,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5e9f392d4b5c..abcc31068d5c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,40 +1,36 @@ - + https://github.com/dotnet/installer - e6dd91c290b808f971a1ac69c2fb29395bbf1051 + 8c1708f37899815bc298ab30e5f2561ec47f1929 - + https://github.com/dotnet/runtime - d25158d0dffd699340cedcfd43324c87a809a214 + 5108757b997c59ab8ba1fc5309ab0d4e730e2b77 - + https://github.com/xamarin/xamarin-android - 8f1d9a47205ead80132661f68b0cee9ed0e0220b + 8a2080306210302d5caca50ab9906240282825f4 - + https://github.com/xamarin/xamarin-macios - 754abbf6a3563f6267e5717ae832b4ac25b1f2fb + df0151d09a23a1630022ad653036d11ce4b396b8 - + https://github.com/xamarin/xamarin-macios - 754abbf6a3563f6267e5717ae832b4ac25b1f2fb + df0151d09a23a1630022ad653036d11ce4b396b8 - + https://github.com/xamarin/xamarin-macios - 7e129d7643d1d820e9eb20c102d7ab6ad06f7937 + df0151d09a23a1630022ad653036d11ce4b396b8 - + https://github.com/xamarin/xamarin-macios - 7e129d7643d1d820e9eb20c102d7ab6ad06f7937 + df0151d09a23a1630022ad653036d11ce4b396b8 - + https://github.com/dotnet/emsdk - daca2015ce74956591df9c9dc7ee732af7863b42 - - - https://github.com/dotnet/emsdk - daca2015ce74956591df9c9dc7ee732af7863b42 + aecb1c71c70f6db44035602a879c57fa495d37e8 https://dev.azure.com/microsoft/ProjectReunion/_git/ProjectReunionInternal diff --git a/eng/Versions.props b/eng/Versions.props index 31cac336c8d2..8de758339418 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -3,25 +3,25 @@ 6.0.547 - 7.0.100-rtm.22519.39 + 8.0.100-alpha.1.22526.2 - 7.0.0-rtm.22511.4 + 8.0.0-alpha.1.22524.5 7.0.0 7.0.0 7.0.0 - 33.0.4 + 34.0.0-preview.1.50 - 15.4.2372 - 12.3.2372 - 16.0.1478 - 16.0.1478 + 16.1.585-net8-p1 + 13.0.1140-net8-p1 + 16.1.585-net8-p1 + 16.1.585-net8-p1 - 7.0.100 + 7.0.104 - 7.0.0-rtm.22504.3 - $(MicrosoftNETWorkloadEmscriptennet7Manifest70100PackageVersion) + 8.0.0-alpha.1.22510.1 + $(MicrosoftNETWorkloadEmscriptennet7Manifest80100PackageVersion) 1.1.5 10.0.22621.1 @@ -69,13 +69,13 @@ 1.2.0 - 7.0.100 - $(DotNetVersionBand)$([System.Text.RegularExpressions.Regex]::Match($(MicrosoftDotnetSdkInternalPackageVersion), `\-(preview|rc).\d+`)) + 8.0.100 + $(DotNetVersionBand)$([System.Text.RegularExpressions.Regex]::Match($(MicrosoftDotnetSdkInternalPackageVersion), `\-(preview|rc|alpha).\d+`)) $(DotNetSdkManifestsFolder) $(DotNetVersionBand) $(DotNetVersionBand) $(DotNetSdkManifestsFolder) $(DotNetSdkManifestsFolder) - 7.0.100 + $(DotNetSdkManifestsFolder) diff --git a/eng/cake/dotnet.cake b/eng/cake/dotnet.cake index ba6e4908e00e..4b6b6e87ac68 100644 --- a/eng/cake/dotnet.cake +++ b/eng/cake/dotnet.cake @@ -24,7 +24,7 @@ ProcessTFMSwitches(); // Tasks for CI Task("dotnet") - .Description("Provisions .NET 6 into bin/dotnet based on eng/Versions.props") + .Description("Provisions .NET 8 into bin/dotnet based on eng/Versions.props") .Does(() => { if (!localDotnet) diff --git a/eng/devices/android.cake b/eng/devices/android.cake index dc4fe07c38c9..10d06abdebf7 100644 --- a/eng/devices/android.cake +++ b/eng/devices/android.cake @@ -12,7 +12,7 @@ string DEVICE_NAME = Argument("skin", EnvironmentVariable("ANDROID_TEST_SKIN") ? // optional var USE_DOTNET = Argument("dotnet", true); var DOTNET_PATH = Argument("dotnet-path", EnvironmentVariable("DOTNET_PATH")); -var TARGET_FRAMEWORK = Argument("tfm", EnvironmentVariable("TARGET_FRAMEWORK") ?? (USE_DOTNET ? "net7.0-android" : "")); +var TARGET_FRAMEWORK = Argument("tfm", EnvironmentVariable("TARGET_FRAMEWORK") ?? (USE_DOTNET ? "net8.0-android" : "")); var BINLOG_ARG = Argument("binlog", EnvironmentVariable("ANDROID_TEST_BINLOG") ?? ""); DirectoryPath BINLOG_DIR = string.IsNullOrEmpty(BINLOG_ARG) && !string.IsNullOrEmpty(PROJECT.FullPath) ? PROJECT.GetDirectory() : BINLOG_ARG; var TEST_APP = Argument("app", EnvironmentVariable("ANDROID_TEST_APP") ?? ""); diff --git a/eng/devices/ios.cake b/eng/devices/ios.cake index b5916583d328..793ee08f7993 100644 --- a/eng/devices/ios.cake +++ b/eng/devices/ios.cake @@ -10,7 +10,7 @@ string TEST_DEVICE = Argument("device", EnvironmentVariable("IOS_TEST_DEVICE") ? // optional var USE_DOTNET = Argument("dotnet", true); var DOTNET_PATH = Argument("dotnet-path", EnvironmentVariable("DOTNET_PATH")); -var TARGET_FRAMEWORK = Argument("tfm", EnvironmentVariable("TARGET_FRAMEWORK") ?? (USE_DOTNET ? "net7.0-ios" : "")); +var TARGET_FRAMEWORK = Argument("tfm", EnvironmentVariable("TARGET_FRAMEWORK") ?? (USE_DOTNET ? "net8.0-ios" : "")); var BINLOG_ARG = Argument("binlog", EnvironmentVariable("IOS_TEST_BINLOG") ?? ""); DirectoryPath BINLOG_DIR = string.IsNullOrEmpty(BINLOG_ARG) && !string.IsNullOrEmpty(PROJECT.FullPath) ? PROJECT.GetDirectory() : BINLOG_ARG; var TEST_APP = Argument("app", EnvironmentVariable("IOS_TEST_APP") ?? ""); diff --git a/eng/pipelines/common/device-tests.yml b/eng/pipelines/common/device-tests.yml index 7304c0b189b1..560c218028a8 100644 --- a/eng/pipelines/common/device-tests.yml +++ b/eng/pipelines/common/device-tests.yml @@ -1,7 +1,7 @@ parameters: androidPool: { } iosPool: { } - androidApiLevels: [ 30 ] + androidApiLevels: [ 33 ] iosVersions: [ 'latest' ] provisionatorChannel: 'latest' projects: diff --git a/eng/pipelines/common/variables.yml b/eng/pipelines/common/variables.yml index 7f44c9f4c122..a85b87b0715d 100644 --- a/eng/pipelines/common/variables.yml +++ b/eng/pipelines/common/variables.yml @@ -4,15 +4,15 @@ variables: - name: BuildVersion value: $[counter('buildversion-counter', 5000)] - name: NUGET_VERSION - value: 5.8.1 + value: 6.4.0 - name: DOTNET_SKIP_FIRST_TIME_EXPERIENCE value: true - name: DOTNET_VERSION - value: 5.0.201 + value: 6.0.403 - name: REQUIRED_XCODE - value: 14.0.0 + value: 14.1.0 - name: DEVICETESTS_REQUIRED_XCODE - value: 14.0.0 + value: 14.1.0 - name: LocBranchPrefix value: 'loc-hb' - name: isMainBranch @@ -26,11 +26,11 @@ variables: - name: isPullRequest value: $[eq(variables['Build.Reason'], 'PullRequest')] - name: isLocHandoffBranch - value: $[in(variables['Build.SourceBranch'], 'refs/heads/net6.0', 'refs/heads/net7.0', 'refs/heads/main')] + value: $[in(variables['Build.SourceBranch'], 'refs/heads/net6.0', 'refs/heads/net7.0', 'refs/heads/net8.0', 'refs/heads/main')] - name: signingCondition value: $[or( eq(variables['Sign'], 'true'), - in(variables['Build.SourceBranch'], 'refs/heads/net6.0', 'refs/heads/net7.0', 'refs/heads/main'), + in(variables['Build.SourceBranch'], 'refs/heads/net6.0', 'refs/heads/net7.0', 'refs/heads/net8.0', 'refs/heads/main'), startsWith(variables['Build.SourceBranch'], 'refs/tags/'), startsWith(variables['Build.SourceBranch'], 'refs/heads/release/') )] diff --git a/eng/pipelines/handlers.yml b/eng/pipelines/handlers.yml index 99b83cf7282e..d2b75a129807 100644 --- a/eng/pipelines/handlers.yml +++ b/eng/pipelines/handlers.yml @@ -4,6 +4,7 @@ trigger: - main - release/* - net7.0 + - net8.0 - loc tags: include: @@ -28,6 +29,7 @@ pr: - main - release/* - net7.0 + - net8.0 paths: include: - '*' @@ -104,10 +106,10 @@ parameters: default: - name: default tfm: default - - name: net6 - tfm: net6.0 - - name: net7 - tfm: net7.0 + # - name: net6 + # tfm: net6.0 + - name: net8 + tfm: net8.0 resources: repositories: @@ -175,12 +177,12 @@ stages: inputs: ArtifactName: ${{ BuildPlatform.artifact }} - - stage: pack_net6 + - stage: pack_net displayName: Pack .NET MAUI dependsOn: [] jobs: - ${{ each PackPlatform in parameters.PackPlatforms }}: - - job: pack_net6_${{ PackPlatform.name }} + - job: pack_net_${{ PackPlatform.name }} workspace: clean: all displayName: ${{ PackPlatform.name }} @@ -201,9 +203,9 @@ stages: provisionatorChannel: ${{ parameters.provisionatorChannel }} artifact: ${{ PackPlatform.artifact }} - - stage: samples_net6 + - stage: samples_net displayName: Build .NET MAUI Samples - dependsOn: pack_net6 + dependsOn: pack_net jobs: - ${{ each BuildPlatform in parameters.BuildPlatforms }}: - ${{ each BuildConfiguration in parameters.BuildConfigurations }}: @@ -254,9 +256,9 @@ stages: inputs: ArtifactName: ${{ BuildPlatform.artifact }} - - stage: templates_net6 + - stage: templates_net displayName: Build .NET MAUI Templates - dependsOn: pack_net6 + dependsOn: pack_net jobs: - ${{ each BuildPlatform in parameters.BuildPlatforms }}: - ${{ each BuildConfiguration in parameters.BuildConfigurations }}: diff --git a/eng/provisioning/provisioning.csx b/eng/provisioning/provisioning.csx index a62d57095c9a..1e4b50e9f719 100644 --- a/eng/provisioning/provisioning.csx +++ b/eng/provisioning/provisioning.csx @@ -1,98 +1,7 @@ if (IsMac) { - System.Net.Http.HttpClient client = new System.Net.Http.HttpClient (new System.Net.Http.HttpClientHandler { AllowAutoRedirect = true }); - if (!Directory.Exists ("/Library/Frameworks/Mono.framework/Versions/Current/Commands/")) - { - Item ("Mono", "6.12.0.127") - .Source (_ => "https://download.mono-project.com/archive/6.12.0/macos-10-universal/MonoFramework-MDK-6.12.0.107.macos10.xamarin.universal.pkg"); - } ForceJavaCleanup(); MicrosoftOpenJdk ("11.0.13.8.1"); - - string releaseChannel = Environment.GetEnvironmentVariable ("CHANNEL"); - Console.WriteLine ("ANDROID_SDK_MAC: {0}", Environment.GetEnvironmentVariable ("ANDROID_SDK_MAC")); - Console.WriteLine ("IOS_SDK_MAC: {0}", Environment.GetEnvironmentVariable ("IOS_SDK_MAC")); - Console.WriteLine ("MONO_SDK_MAC: {0}", Environment.GetEnvironmentVariable ("MONO_SDK_MAC")); - Console.WriteLine ("MAC_SDK_MAC: {0}", Environment.GetEnvironmentVariable ("MAC_SDK_MAC")); - Console.WriteLine ("releaseChannel: {0}", releaseChannel); - - bool specificSdkSet = false; - - if(!String.IsNullOrWhiteSpace(Environment.GetEnvironmentVariable ("MONO_SDK_MAC"))) - { - await ResolveUrl (Environment.GetEnvironmentVariable ("MONO_SDK_MAC")); - specificSdkSet = true; - } - - if(!String.IsNullOrWhiteSpace(Environment.GetEnvironmentVariable ("ANDROID_SDK_MAC"))) - { - await ResolveUrl (Environment.GetEnvironmentVariable ("ANDROID_SDK_MAC")); - specificSdkSet = true; - } - - if(!String.IsNullOrWhiteSpace(Environment.GetEnvironmentVariable ("IOS_SDK_MAC"))) - { - await ResolveUrl (Environment.GetEnvironmentVariable ("IOS_SDK_MAC")); - specificSdkSet = true; - } - - if(!String.IsNullOrWhiteSpace(Environment.GetEnvironmentVariable ("MAC_SDK_MAC"))) - { - await ResolveUrl (Environment.GetEnvironmentVariable ("MAC_SDK_MAC")); - specificSdkSet = true; - } - - if(!specificSdkSet) - { - if(releaseChannel == "Beta") - { - Console.WriteLine ("Beta channel doesn't exist on provisionator"); - } - else if(releaseChannel == "Preview") - { - XamarinChannel("Preview"); - } - else if(releaseChannel == "Stable") - { - XamarinChannel("Stable"); - } - } - - async System.Threading.Tasks.Task ResolveUrl (string url) - { - // When downloading a package using the xamci we have to use the following code to - // install updates otherwise provionator can't tell the difference between a new package or an old one - try - { - using (var response = await client.GetAsync (url, System.Net.Http.HttpCompletionOption.ResponseHeadersRead)) { - response.EnsureSuccessStatusCode (); - Item(response.RequestMessage.RequestUri.ToString()); - } - } - catch{ - Item(url); - } - } -} -else -{ - - if(!String.IsNullOrWhiteSpace(Environment.GetEnvironmentVariable ("ANDROID_SDK_WINDOWS"))) - Item ("Xamarin.Android") - .Source (_ => Environment.GetEnvironmentVariable ("ANDROID_SDK_WINDOWS")); - - if(!String.IsNullOrWhiteSpace(Environment.GetEnvironmentVariable ("IOS_SDK_WINDOWS"))) - Item ("Xamarin.iOS") - .Source (_ => Environment.GetEnvironmentVariable ("IOS_SDK_WINDOWS")); - - if(!String.IsNullOrWhiteSpace(Environment.GetEnvironmentVariable ("MONO_SDK_WINDOWS"))) - Item ("Mono") - .Source (_ => Environment.GetEnvironmentVariable ("MONO_SDK_WINDOWS")); - - if(!String.IsNullOrWhiteSpace(Environment.GetEnvironmentVariable ("MAC_SDK_WINDOWS"))) - Item ("Xamarin.Mac") - .Source (_ => Environment.GetEnvironmentVariable ("MAC_SDK_WINDOWS")); - } string ANDROID_API_SDKS = Environment.GetEnvironmentVariable ("ANDROID_API_SDKS"); @@ -100,10 +9,11 @@ string ANDROID_API_SDKS = Environment.GetEnvironmentVariable ("ANDROID_API_SDKS" if(String.IsNullOrWhiteSpace(ANDROID_API_SDKS)) { AndroidSdk() - .ApiLevel((AndroidApiLevel)21) - .ApiLevel((AndroidApiLevel)22) .ApiLevel((AndroidApiLevel)23) .ApiLevel((AndroidApiLevel)24) + .ApiLevel((AndroidApiLevel)25) + .ApiLevel((AndroidApiLevel)26) + .ApiLevel((AndroidApiLevel)27) .ApiLevel((AndroidApiLevel)28) .ApiLevel((AndroidApiLevel)29) .ApiLevel((AndroidApiLevel)30) @@ -158,6 +68,24 @@ if(String.IsNullOrWhiteSpace(ANDROID_API_SDKS)) AndroidSystemImageApi.GooglePlayStore, AndroidSystemImageAbi.x86, AndroidVirtualDevice.NEXUS_5X) + // .VirtualDevice( + // "Android_API31", + // AndroidApiLevel.Android_12, + // AndroidSystemImageApi.GooglePlayStore, + // AndroidSystemImageAbi.x86, + // AndroidVirtualDevice.NEXUS_5X) + // .VirtualDevice( + // "Android_API32", + // AndroidApiLevel.Android_12sv2, + // AndroidSystemImageApi.GooglePlayStore, + // AndroidSystemImageAbi.x86, + // AndroidVirtualDevice.NEXUS_5X) + // .VirtualDevice( + // "Android_API33", + // AndroidApiLevel.Android_13, + // AndroidSystemImageApi.GooglePlayStore, + // AndroidSystemImageAbi.x86, + // AndroidVirtualDevice.NEXUS_5X) .SdkManagerPackage ("build-tools;33.0.0"); } else{ diff --git a/src/DotNet/Dependencies/Workloads.csproj b/src/DotNet/Dependencies/Workloads.csproj index a11638657daf..a8e819a035ab 100644 --- a/src/DotNet/Dependencies/Workloads.csproj +++ b/src/DotNet/Dependencies/Workloads.csproj @@ -3,6 +3,7 @@ netstandard2.0 + diff --git a/src/DotNet/DotNet.csproj b/src/DotNet/DotNet.csproj index 73af4f3e7f83..2d33dbd3dee9 100644 --- a/src/DotNet/DotNet.csproj +++ b/src/DotNet/DotNet.csproj @@ -127,7 +127,7 @@ <_WorkloadIds Include="macos" /> <_WorkloadIds Include="ios" /> <_WorkloadIds Include="tvos" /> - <_WorkloadIds Include="tizen" /> + <_WorkloadIds Include="tizen" Condition=" '$(IncludeTizenTargetFrameworks)' == 'true' " />