Skip to content

Manual update for .net8 sdk and workloads #11387

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rmarinho merged 23 commits into from
Nov 24, 2022
Merged

Manual update for .net8 sdk and workloads #11387

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
40c7e3b
Manual update for .net8 sdk and workloads
rmarinho Nov 15, 2022
8daefe6
Update iOS net8
rmarinho Nov 15, 2022
8fc3d4d
Update the rest of iOS bits
rmarinho Nov 15, 2022
5d9d964
Update yaml triggers
rmarinho Nov 15, 2022
be28ba6
Update GitInfo
rmarinho Nov 16, 2022
4ff1bf2
Bump .net maui version
rmarinho Nov 16, 2022
965210b
Don't build tizen
rmarinho Nov 16, 2022
1d1f303
Remove GraphicsTester.Skia.Tizen from the sln
rmarinho Nov 16, 2022
91f4376
Bump to XCODE 14.1
rmarinho Nov 16, 2022
0368b19
Disable `$(AndroidEnableMarshalMethods)`
jonathanpeppers Nov 17, 2022
9529596
Skip `tizen` workload install
jonathanpeppers Nov 18, 2022
1436f46
Add Tizen back
rmarinho Nov 22, 2022
ba35f04
Add net8 to test framework
rmarinho Nov 23, 2022
902eec3
Fix android tests versions and other variables and provisioning
rmarinho Nov 23, 2022
05d513e
Update more dotnet versions
rmarinho Nov 23, 2022
09935d9
Really disable ResizetizeImages to fix MacCatalyst issue
rmarinho Nov 23, 2022
d6b570a
Auto-format source code
Nov 23, 2022
005ca03
Fix provisioning
rmarinho Nov 23, 2022
b782773
Merge branch 'bump-net8' of https://github.com/dotnet/maui into bump-…
rmarinho Nov 23, 2022
813a1a4
Revert "Auto-format source code"
rmarinho Nov 24, 2022
5ff6a2c
Don't be net6 templates for now
rmarinho Nov 24, 2022
8bd61c2
Revert "Remove GraphicsTester.Skia.Tizen from the sln"
rmarinho Nov 24, 2022
c0f0ab1
Revert "Really disable ResizetizeImages to fix MacCatalyst issue"
rmarinho Nov 24, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions NuGet.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,8 @@
<clear />
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
<!-- Begin: Package sources from dotnet-aspnetcore -->
<add key="darc-pub-dotnet-aspnetcore-d50065c" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-aspnetcore-d50065c4/nuget/v3/index.json" />
<add key="darc-pub-dotnet-aspnetcore-d50065c-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-aspnetcore-d50065c4-1/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-aspnetcore -->
<!-- Begin: Package sources from dotnet-runtime -->
<add key="darc-pub-dotnet-runtime-cd2d837" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-cd2d8379/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-runtime -->
<!-- Begin: Package sources from dotnet-windowsdesktop -->
<!-- End: Package sources from dotnet-windowsdesktop -->
Expand All @@ -20,6 +17,7 @@
<add key="dotnet-public" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json" protocolVersion="3" />
<add key="dotnet6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json" />
<add key="dotnet7" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet7/nuget/v3/index.json" />
<add key="dotnet8" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet8/nuget/v3/index.json" />
<add key="skiasharp" value="https://pkgs.dev.azure.com/xamarin/public/_packaging/SkiaSharp/nuget/v3/index.json" />
<add key="wasdk-internal" value="https://pkgs.dev.azure.com/microsoft/ProjectReunion/_packaging/Project.Reunion.nuget.internal/nuget/v3/index.json" />
<!-- Added manually for dotnet/runtime 6.0.11 -->
Expand Down
36 changes: 16 additions & 20 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,40 +1,36 @@
<Dependencies>
<ProductDependencies>
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="7.0.100-rtm.22519.39" CoherentParentDependency="Microsoft.Android.Sdk.Windows">
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="8.0.100-alpha.1.22526.2" CoherentParentDependency="Microsoft.Android.Sdk.Windows">
<Uri>https://github.com/dotnet/installer</Uri>
<Sha>e6dd91c290b808f971a1ac69c2fb29395bbf1051</Sha>
<Sha>8c1708f37899815bc298ab30e5f2561ec47f1929</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="7.0.0-rtm.22511.4" CoherentParentDependency="Microsoft.Android.Sdk.Windows">
<Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.0-alpha.1.22524.5" CoherentParentDependency="Microsoft.Android.Sdk.Windows">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>d25158d0dffd699340cedcfd43324c87a809a214</Sha>
<Sha>5108757b997c59ab8ba1fc5309ab0d4e730e2b77</Sha>
</Dependency>
<Dependency Name="Microsoft.Android.Sdk.Windows" Version="33.0.4">
<Dependency Name="Microsoft.Android.Sdk.Windows" Version="34.0.0-preview.1.50">
<Uri>https://github.com/xamarin/xamarin-android</Uri>
<Sha>8f1d9a47205ead80132661f68b0cee9ed0e0220b</Sha>
<Sha>8a2080306210302d5caca50ab9906240282825f4</Sha>
</Dependency>
<Dependency Name="Microsoft.MacCatalyst.Sdk" Version="15.4.2372">
<Dependency Name="Microsoft.MacCatalyst.Sdk" Version="16.1.585-net8-p1">
<Uri>https://github.com/xamarin/xamarin-macios</Uri>
<Sha>754abbf6a3563f6267e5717ae832b4ac25b1f2fb</Sha>
<Sha>df0151d09a23a1630022ad653036d11ce4b396b8</Sha>
</Dependency>
<Dependency Name="Microsoft.macOS.Sdk" Version="12.3.2372">
<Dependency Name="Microsoft.macOS.Sdk" Version="13.0.1140-net8-p1">
<Uri>https://github.com/xamarin/xamarin-macios</Uri>
<Sha>754abbf6a3563f6267e5717ae832b4ac25b1f2fb</Sha>
<Sha>df0151d09a23a1630022ad653036d11ce4b396b8</Sha>
</Dependency>
<Dependency Name="Microsoft.iOS.Sdk" Version="16.0.1478">
<Dependency Name="Microsoft.iOS.Sdk" Version="16.1.585-net8-p1">
<Uri>https://github.com/xamarin/xamarin-macios</Uri>
<Sha>7e129d7643d1d820e9eb20c102d7ab6ad06f7937</Sha>
<Sha>df0151d09a23a1630022ad653036d11ce4b396b8</Sha>
</Dependency>
<Dependency Name="Microsoft.tvOS.Sdk" Version="16.0.1478">
<Dependency Name="Microsoft.tvOS.Sdk" Version="16.1.585-net8-p1">
<Uri>https://github.com/xamarin/xamarin-macios</Uri>
<Sha>7e129d7643d1d820e9eb20c102d7ab6ad06f7937</Sha>
<Sha>df0151d09a23a1630022ad653036d11ce4b396b8</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100" Version="7.0.0-rtm.22504.3" CoherentParentDependency="Microsoft.NETCore.App.Ref">
<Dependency Name="Microsoft.NET.Workload.Emscripten.net7.Manifest-8.0.100" Version="8.0.0-alpha.1.22510.1" CoherentParentDependency="Microsoft.NETCore.App.Ref">
<Uri>https://github.com/dotnet/emsdk</Uri>
<Sha>daca2015ce74956591df9c9dc7ee732af7863b42</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100" Version="7.0.0-rtm.22504.3" CoherentParentDependency="Microsoft.NETCore.App.Ref">
<Uri>https://github.com/dotnet/emsdk</Uri>
<Sha>daca2015ce74956591df9c9dc7ee732af7863b42</Sha>
<Sha>aecb1c71c70f6db44035602a879c57fa495d37e8</Sha>
</Dependency>
<Dependency Name="Microsoft.WindowsAppSDK" Version="0.0.1">
<Uri>https://dev.azure.com/microsoft/ProjectReunion/_git/ProjectReunionInternal</Uri>
Expand Down
22 changes: 11 additions & 11 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,25 +3,25 @@
<!-- Current previous .NET SDK major version's stable release of MAUI packages -->
<MicrosoftMauiPreviousDotNetReleasedVersion>6.0.547</MicrosoftMauiPreviousDotNetReleasedVersion>
<!-- dotnet/installer -->
<MicrosoftDotnetSdkInternalPackageVersion>7.0.100-rtm.22519.39</MicrosoftDotnetSdkInternalPackageVersion>
<MicrosoftDotnetSdkInternalPackageVersion>8.0.100-alpha.1.22526.2</MicrosoftDotnetSdkInternalPackageVersion>
<!-- dotnet/runtime -->
<MicrosoftNETCoreAppRefPackageVersion>7.0.0-rtm.22511.4</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>8.0.0-alpha.1.22524.5</MicrosoftNETCoreAppRefPackageVersion>
<!-- NOTE: should eventually revert back to $(MicrosoftNETCoreAppRefPackageVersion) in .NET 7 -->
<MicrosoftExtensionsPackageVersion>7.0.0</MicrosoftExtensionsPackageVersion>
<MicrosoftExtensionsServicingPackageVersion>7.0.0</MicrosoftExtensionsServicingPackageVersion>
<SystemCodeDomPackageVersion>7.0.0</SystemCodeDomPackageVersion>
<!-- xamarin/xamarin-android -->
<MicrosoftAndroidSdkWindowsPackageVersion>33.0.4</MicrosoftAndroidSdkWindowsPackageVersion>
<MicrosoftAndroidSdkWindowsPackageVersion>34.0.0-preview.1.50</MicrosoftAndroidSdkWindowsPackageVersion>
<!-- xamarin/xamarin-macios -->
<MicrosoftMacCatalystSdkPackageVersion>15.4.2372</MicrosoftMacCatalystSdkPackageVersion>
<MicrosoftmacOSSdkPackageVersion>12.3.2372</MicrosoftmacOSSdkPackageVersion>
<MicrosoftiOSSdkPackageVersion>16.0.1478</MicrosoftiOSSdkPackageVersion>
<MicrosofttvOSSdkPackageVersion>16.0.1478</MicrosofttvOSSdkPackageVersion>
<MicrosoftMacCatalystSdkPackageVersion>16.1.585-net8-p1</MicrosoftMacCatalystSdkPackageVersion>
<MicrosoftmacOSSdkPackageVersion>13.0.1140-net8-p1</MicrosoftmacOSSdkPackageVersion>
<MicrosoftiOSSdkPackageVersion>16.1.585-net8-p1</MicrosoftiOSSdkPackageVersion>
<MicrosofttvOSSdkPackageVersion>16.1.585-net8-p1</MicrosofttvOSSdkPackageVersion>
<!-- Samsung/Tizen.NET -->
<SamsungTizenSdkPackageVersion>7.0.100</SamsungTizenSdkPackageVersion>
<!-- emsdk -->
<MicrosoftNETWorkloadEmscriptennet7Manifest70100PackageVersion>7.0.0-rtm.22504.3</MicrosoftNETWorkloadEmscriptennet7Manifest70100PackageVersion>
<MicrosoftNETWorkloadEmscriptenPackageVersion>$(MicrosoftNETWorkloadEmscriptennet7Manifest70100PackageVersion)</MicrosoftNETWorkloadEmscriptenPackageVersion>
<MicrosoftNETWorkloadEmscriptennet7Manifest80100PackageVersion>8.0.0-alpha.1.22510.1</MicrosoftNETWorkloadEmscriptennet7Manifest80100PackageVersion>
<MicrosoftNETWorkloadEmscriptenPackageVersion>$(MicrosoftNETWorkloadEmscriptennet7Manifest80100PackageVersion)</MicrosoftNETWorkloadEmscriptenPackageVersion>
<!-- wasdk -->
<MicrosoftWindowsAppSDKPackageVersion>1.1.5</MicrosoftWindowsAppSDKPackageVersion>
<MicrosoftWindowsSDKBuildToolsPackageVersion>10.0.22621.1</MicrosoftWindowsSDKBuildToolsPackageVersion>
Expand Down Expand Up @@ -69,8 +69,8 @@
<FizzlerPackageVersion>1.2.0</FizzlerPackageVersion>
</PropertyGroup>
<PropertyGroup>
<DotNetVersionBand Condition=" '$(DotNetVersionBand)' == '' ">7.0.100</DotNetVersionBand>
<DotNetSdkManifestsFolder>$(DotNetVersionBand)$([System.Text.RegularExpressions.Regex]::Match($(MicrosoftDotnetSdkInternalPackageVersion), `\-(preview|rc).\d+`))</DotNetSdkManifestsFolder>
<DotNetVersionBand Condition=" '$(DotNetVersionBand)' == '' ">8.0.100</DotNetVersionBand>
<DotNetSdkManifestsFolder>$(DotNetVersionBand)$([System.Text.RegularExpressions.Regex]::Match($(MicrosoftDotnetSdkInternalPackageVersion), `\-(preview|rc|alpha).\d+`))</DotNetSdkManifestsFolder>
<DotNetMauiManifestVersionBand>$(DotNetSdkManifestsFolder)</DotNetMauiManifestVersionBand>
<DotNetMonoManifestVersionBand>$(DotNetVersionBand)</DotNetMonoManifestVersionBand>
<DotNetEmscriptenManifestVersionBand>$(DotNetVersionBand)</DotNetEmscriptenManifestVersionBand>
Expand Down
2 changes: 2 additions & 0 deletions eng/pipelines/handlers.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ trigger:
- main
- release/*
- net7.0
- net8.0
- loc
tags:
include:
Expand All @@ -28,6 +29,7 @@ pr:
- main
- release/*
- net7.0
- net8.0
paths:
include:
- '*'
Expand Down
1 change: 1 addition & 0 deletions src/DotNet/Dependencies/Workloads.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
<TargetFramework>netstandard2.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
<PackageDownload Include="Microsoft.NET.Workload.Mono.ToolChain.Manifest-$(DotNetMonoManifestVersionBand)" Version="[$(MicrosoftNETCoreAppRefPackageVersion)]" />
<PackageDownload Include="Microsoft.NET.Workload.Mono.ToolChain.net6.Manifest-$(DotNetMonoManifestVersionBand)" Version="[$(MicrosoftNETCoreAppRefPackageVersion)]" />
<PackageDownload Include="Microsoft.NET.Workload.Mono.ToolChain.net7.Manifest-$(DotNetMonoManifestVersionBand)" Version="[$(MicrosoftNETCoreAppRefPackageVersion)]" />
<PackageDownload Include="Microsoft.NET.Workload.Emscripten.net6.Manifest-$(DotNetEmscriptenManifestVersionBand)" Version="[$(MicrosoftNETWorkloadEmscriptenPackageVersion)]" />
Expand Down