Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
24 changes: 12 additions & 12 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
@@ -1,42 +1,42 @@
<?xml version="1.0" encoding="utf-8"?>
<Dependencies>
<ProductDependencies>
<Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-10.0.100" Version="10.0.103">
<Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-11.0.100-preview.1" Version="11.0.100-preview.1.26065.113">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet</Uri>
<Sha>c799588e73adda69ba97b1a826e1cc5326249e04</Sha>
<Sha>7408f8cf31029ec836004ed244df7287beee2827</Sha>
<SourceBuild RepoName="emsdk" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.NET.Workload.Mono.Toolchain.Current.Manifest-10.0.100" Version="10.0.103">
<Dependency Name="Microsoft.NET.Workload.Mono.Toolchain.Current.Manifest-11.0.100-preview.1" Version="11.0.100-preview.1.26065.113">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet</Uri>
<Sha>c799588e73adda69ba97b1a826e1cc5326249e04</Sha>
<Sha>7408f8cf31029ec836004ed244df7287beee2827</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Sdk.Android.Manifest-10.0.100" Version="36.1.12">
<Dependency Name="Microsoft.NET.Sdk.Android.Manifest-11.0.100-preview.1" Version="36.1.12">
<Uri>https://github.com/dotnet/android</Uri>
<Sha>d611c1210ffde26280ee0faddd04e7621af41f1e</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Sdk.iOS.Manifest-10.0.100" Version="26.2.10191">
<Dependency Name="Microsoft.NET.Sdk.iOS.Manifest-11.0.100-preview.1" Version="26.2.10191">
<Uri>https://github.com/dotnet/macios</Uri>
<Sha>c60d1ae6ba4fd32ef99ccf94aca56e03c51eab86</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Sdk.tvOS.Manifest-10.0.100" Version="26.2.10191">
<Dependency Name="Microsoft.NET.Sdk.tvOS.Manifest-11.0.100-preview.1" Version="26.2.10191">
<Uri>https://github.com/dotnet/macios</Uri>
<Sha>c60d1ae6ba4fd32ef99ccf94aca56e03c51eab86</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Sdk.MacCatalyst.Manifest-10.0.100" Version="26.2.10191">
<Dependency Name="Microsoft.NET.Sdk.MacCatalyst.Manifest-11.0.100-preview.1" Version="26.2.10191">
<Uri>https://github.com/dotnet/macios</Uri>
<Sha>c60d1ae6ba4fd32ef99ccf94aca56e03c51eab86</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Sdk.macOS.Manifest-10.0.100" Version="26.2.10191">
<Dependency Name="Microsoft.NET.Sdk.macOS.Manifest-11.0.100-preview.1" Version="26.2.10191">
<Uri>https://github.com/dotnet/macios</Uri>
<Sha>c60d1ae6ba4fd32ef99ccf94aca56e03c51eab86</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Sdk.Maui.Manifest-10.0.100" Version="10.0.30">
<Dependency Name="Microsoft.NET.Sdk.Maui.Manifest-11.0.100-preview.1" Version="10.0.30">
<Uri>https://github.com/dotnet/maui</Uri>
<Sha>8e226ebb489a883ea2367f087c45431f9a3e4f37</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Sdk" Version="10.0.103-servicing.26071.104">
<Dependency Name="Microsoft.NET.Sdk" Version="11.0.100-preview.1.26065.113">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet</Uri>
<Sha>c799588e73adda69ba97b1a826e1cc5326249e04</Sha>
<Sha>7408f8cf31029ec836004ed244df7287beee2827</Sha>
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
Expand Down
49 changes: 24 additions & 25 deletions eng/Versions.props
Original file line number Diff line number Diff line change
@@ -1,18 +1,17 @@
<Project>
<!-- Arcade features -->
<PropertyGroup>
<VersionMajor>10</VersionMajor>
<VersionMajor>11</VersionMajor>
<VersionMinor>0</VersionMinor>
<VersionSDKMinor>1</VersionSDKMinor>
<!-- Use the feature version for each monthly servicng release -->
<!-- Use the patch version for intra-monthly releases and hotfixes -->
<VersionFeature>01</VersionFeature>
<VersionFeature>00</VersionFeature>
<VersionPatch>0</VersionPatch>
<!-- Enable to remove prerelease label. -->
<StabilizePackageVersion Condition="'$(StabilizePackageVersion)' == ''">false</StabilizePackageVersion>
<PreReleaseVersionLabel>servicing</PreReleaseVersionLabel>
<PreReleaseVersionIteration Condition="'$(StabilizePackageVersion)' != 'true'">
</PreReleaseVersionIteration>
<PreReleaseVersionLabel>preview</PreReleaseVersionLabel>
<PreReleaseVersionIteration Condition="'$(StabilizePackageVersion)' != 'true'">1</PreReleaseVersionIteration>
</PropertyGroup>
<PropertyGroup>
<VersionPrefix>$(VersionMajor).$(VersionSDKMinor)$(VersionFeature).$(VersionPatch)</VersionPrefix>
Expand Down Expand Up @@ -40,33 +39,33 @@
</PropertyGroup>
<PropertyGroup Label="EmscriptenWorkloads">
<!-- Workloads from dotnet/sdk -->
<MicrosoftNETWorkloadEmscriptenCurrentManifest100100PackageVersion>10.0.103</MicrosoftNETWorkloadEmscriptenCurrentManifest100100PackageVersion>
<EmscriptenWorkloadManifestVersion>$(MicrosoftNETWorkloadEmscriptenCurrentManifest100100PackageVersion)</EmscriptenWorkloadManifestVersion>
<MicrosoftNETWorkloadEmscriptenCurrentManifest110100PackageVersion>11.0.100-preview.1.26065.113</MicrosoftNETWorkloadEmscriptenCurrentManifest110100PackageVersion>
<EmscriptenWorkloadManifestVersion>$(MicrosoftNETWorkloadEmscriptenCurrentManifest110100PackageVersion)</EmscriptenWorkloadManifestVersion>
<!-- emsdk workload prerelease version band must match the emsdk feature band -->
<EmscriptenWorkloadFeatureBand>10.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-[A-z]*[\.]*\d*`))</EmscriptenWorkloadFeatureBand>
<EmscriptenWorkloadFeatureBand>11.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-[A-z]*[\.]*\d*`))</EmscriptenWorkloadFeatureBand>
</PropertyGroup>
<PropertyGroup Label="MauiWorkloads">
<MauiFeatureBand>10.0.100</MauiFeatureBand>
<MicrosoftNETSdkAndroidManifest100100PackageVersion>36.1.12</MicrosoftNETSdkAndroidManifest100100PackageVersion>
<MicrosoftNETSdkiOSManifest100100PackageVersion>26.2.10191</MicrosoftNETSdkiOSManifest100100PackageVersion>
<MicrosoftNETSdktvOSManifest100100PackageVersion>26.2.10191</MicrosoftNETSdktvOSManifest100100PackageVersion>
<MicrosoftNETSdkMacCatalystManifest100100PackageVersion>26.2.10191</MicrosoftNETSdkMacCatalystManifest100100PackageVersion>
<MicrosoftNETSdkmacOSManifest100100PackageVersion>26.2.10191</MicrosoftNETSdkmacOSManifest100100PackageVersion>
<MicrosoftNETSdkMauiManifest100100PackageVersion>10.0.30</MicrosoftNETSdkMauiManifest100100PackageVersion>
<MauiWorkloadManifestVersion>$(MicrosoftNETSdkMauiManifest100100PackageVersion)</MauiWorkloadManifestVersion>
<XamarinAndroidWorkloadManifestVersion>$(MicrosoftNETSdkAndroidManifest100100PackageVersion)</XamarinAndroidWorkloadManifestVersion>
<XamarinIOSWorkloadManifestVersion>$(MicrosoftNETSdkiOSManifest100100PackageVersion)</XamarinIOSWorkloadManifestVersion>
<XamarinMacCatalystWorkloadManifestVersion>$(MicrosoftNETSdkMacCatalystManifest100100PackageVersion)</XamarinMacCatalystWorkloadManifestVersion>
<XamarinMacOSWorkloadManifestVersion>$(MicrosoftNETSdkmacOSManifest100100PackageVersion)</XamarinMacOSWorkloadManifestVersion>
<XamarinTvOSWorkloadManifestVersion>$(MicrosoftNETSdktvOSManifest100100PackageVersion)</XamarinTvOSWorkloadManifestVersion>
<MauiFeatureBand>11.0.100-preview.1</MauiFeatureBand>
<MicrosoftNETSdkAndroidManifest110100PackageVersion>36.1.12</MicrosoftNETSdkAndroidManifest110100PackageVersion>
<MicrosoftNETSdkiOSManifest110100PackageVersion>26.2.10191</MicrosoftNETSdkiOSManifest110100PackageVersion>
<MicrosoftNETSdktvOSManifest110100PackageVersion>26.2.10191</MicrosoftNETSdktvOSManifest110100PackageVersion>
<MicrosoftNETSdkMacCatalystManifest110100PackageVersion>26.2.10191</MicrosoftNETSdkMacCatalystManifest110100PackageVersion>
<MicrosoftNETSdkmacOSManifest110100PackageVersion>26.2.10191</MicrosoftNETSdkmacOSManifest110100PackageVersion>
<MicrosoftNETSdkMauiManifest110100PackageVersion>10.0.30</MicrosoftNETSdkMauiManifest110100PackageVersion>
Comment on lines +49 to +54
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We plan to branch on Monday, but I think it's fine to use the .NET 10 numbers for now.

<MauiWorkloadManifestVersion>$(MicrosoftNETSdkMauiManifest110100PackageVersion)</MauiWorkloadManifestVersion>
<XamarinAndroidWorkloadManifestVersion>$(MicrosoftNETSdkAndroidManifest110100PackageVersion)</XamarinAndroidWorkloadManifestVersion>
<XamarinIOSWorkloadManifestVersion>$(MicrosoftNETSdkiOSManifest110100PackageVersion)</XamarinIOSWorkloadManifestVersion>
<XamarinMacCatalystWorkloadManifestVersion>$(MicrosoftNETSdkMacCatalystManifest110100PackageVersion)</XamarinMacCatalystWorkloadManifestVersion>
<XamarinMacOSWorkloadManifestVersion>$(MicrosoftNETSdkmacOSManifest110100PackageVersion)</XamarinMacOSWorkloadManifestVersion>
<XamarinTvOSWorkloadManifestVersion>$(MicrosoftNETSdktvOSManifest110100PackageVersion)</XamarinTvOSWorkloadManifestVersion>
</PropertyGroup>
<PropertyGroup Label="MonoWorkloads">
<MicrosoftNETWorkloadMonoToolchainCurrentManifest100100PackageVersion>10.0.103</MicrosoftNETWorkloadMonoToolchainCurrentManifest100100PackageVersion>
<MicrosoftNETSdkPackageVersion>10.0.103-servicing.26071.104</MicrosoftNETSdkPackageVersion>
<MicrosoftNETWorkloadMonoToolchainCurrentManifest110100PackageVersion>11.0.100-preview.1.26065.113</MicrosoftNETWorkloadMonoToolchainCurrentManifest110100PackageVersion>
<MicrosoftNETSdkPackageVersion>11.0.100-preview.1.26065.113</MicrosoftNETSdkPackageVersion>
<!-- Workloads from dotnet/sdk use MicrosoftNETSdkPackageVersion as the manifests are now built from the dotnet/sdk repo -->
<MonoWorkloadManifestVersion>$(MicrosoftNETWorkloadMonoToolChainCurrentManifest100100PackageVersion)</MonoWorkloadManifestVersion>
<MonoWorkloadManifestVersion>$(MicrosoftNETWorkloadMonoToolChainCurrentManifest110100PackageVersion)</MonoWorkloadManifestVersion>
<!-- mono workload prerelease version band must match the runtime feature band -->
<MonoWorkloadFeatureBand>10.0.100$([System.Text.RegularExpressions.Regex]::Match($(MonoWorkloadManifestVersion), `-[A-z]*[\.]*\d*`))</MonoWorkloadFeatureBand>
<MonoWorkloadFeatureBand>11.0.100$([System.Text.RegularExpressions.Regex]::Match($(MonoWorkloadManifestVersion), `-[A-z]*[\.]*\d*`))</MonoWorkloadFeatureBand>
</PropertyGroup>
<!-- deployment-tools dependencies -->
<PropertyGroup>
Expand Down