Skip to content

Commit bc319ae

Browse files
marcpopMSFTmarcpopMSFT
authored
Branding for 11 preview 1 (#696)
1 parent 29937be commit bc319ae

File tree

2 files changed

+36
-37
lines changed

2 files changed

+36
-37
lines changed

‎eng/Version.Details.xml‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,42 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Dependencies>
33
<ProductDependencies>
4-
<Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-10.0.100" Version="10.0.103">
4+
<Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-11.0.100-preview.1" Version="11.0.100-preview.1.26065.113">
55
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet</Uri>
6-
<Sha>c799588e73adda69ba97b1a826e1cc5326249e04</Sha>
6+
<Sha>7408f8cf31029ec836004ed244df7287beee2827</Sha>
77
<SourceBuild RepoName="emsdk" ManagedOnly="true" />
88
</Dependency>
9-
<Dependency Name="Microsoft.NET.Workload.Mono.Toolchain.Current.Manifest-10.0.100" Version="10.0.103">
9+
<Dependency Name="Microsoft.NET.Workload.Mono.Toolchain.Current.Manifest-11.0.100-preview.1" Version="11.0.100-preview.1.26065.113">
1010
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet</Uri>
11-
<Sha>c799588e73adda69ba97b1a826e1cc5326249e04</Sha>
11+
<Sha>7408f8cf31029ec836004ed244df7287beee2827</Sha>
1212
</Dependency>
13-
<Dependency Name="Microsoft.NET.Sdk.Android.Manifest-10.0.100" Version="36.1.12">
13+
<Dependency Name="Microsoft.NET.Sdk.Android.Manifest-11.0.100-preview.1" Version="36.1.12">
1414
<Uri>https://github.com/dotnet/android</Uri>
1515
<Sha>d611c1210ffde26280ee0faddd04e7621af41f1e</Sha>
1616
</Dependency>
17-
<Dependency Name="Microsoft.NET.Sdk.iOS.Manifest-10.0.100" Version="26.2.10191">
17+
<Dependency Name="Microsoft.NET.Sdk.iOS.Manifest-11.0.100-preview.1" Version="26.2.10191">
1818
<Uri>https://github.com/dotnet/macios</Uri>
1919
<Sha>c60d1ae6ba4fd32ef99ccf94aca56e03c51eab86</Sha>
2020
</Dependency>
21-
<Dependency Name="Microsoft.NET.Sdk.tvOS.Manifest-10.0.100" Version="26.2.10191">
21+
<Dependency Name="Microsoft.NET.Sdk.tvOS.Manifest-11.0.100-preview.1" Version="26.2.10191">
2222
<Uri>https://github.com/dotnet/macios</Uri>
2323
<Sha>c60d1ae6ba4fd32ef99ccf94aca56e03c51eab86</Sha>
2424
</Dependency>
25-
<Dependency Name="Microsoft.NET.Sdk.MacCatalyst.Manifest-10.0.100" Version="26.2.10191">
25+
<Dependency Name="Microsoft.NET.Sdk.MacCatalyst.Manifest-11.0.100-preview.1" Version="26.2.10191">
2626
<Uri>https://github.com/dotnet/macios</Uri>
2727
<Sha>c60d1ae6ba4fd32ef99ccf94aca56e03c51eab86</Sha>
2828
</Dependency>
29-
<Dependency Name="Microsoft.NET.Sdk.macOS.Manifest-10.0.100" Version="26.2.10191">
29+
<Dependency Name="Microsoft.NET.Sdk.macOS.Manifest-11.0.100-preview.1" Version="26.2.10191">
3030
<Uri>https://github.com/dotnet/macios</Uri>
3131
<Sha>c60d1ae6ba4fd32ef99ccf94aca56e03c51eab86</Sha>
3232
</Dependency>
33-
<Dependency Name="Microsoft.NET.Sdk.Maui.Manifest-10.0.100" Version="10.0.30">
33+
<Dependency Name="Microsoft.NET.Sdk.Maui.Manifest-11.0.100-preview.1" Version="10.0.30">
3434
<Uri>https://github.com/dotnet/maui</Uri>
3535
<Sha>8e226ebb489a883ea2367f087c45431f9a3e4f37</Sha>
3636
</Dependency>
37-
<Dependency Name="Microsoft.NET.Sdk" Version="10.0.103-servicing.26071.104">
37+
<Dependency Name="Microsoft.NET.Sdk" Version="11.0.100-preview.1.26065.113">
3838
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet</Uri>
39-
<Sha>c799588e73adda69ba97b1a826e1cc5326249e04</Sha>
39+
<Sha>7408f8cf31029ec836004ed244df7287beee2827</Sha>
4040
</Dependency>
4141
</ProductDependencies>
4242
<ToolsetDependencies>

‎eng/Versions.props‎

Lines changed: 24 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,17 @@
11
<Project>
22
<!-- Arcade features -->
33
<PropertyGroup>
4-
<VersionMajor>10</VersionMajor>
4+
<VersionMajor>11</VersionMajor>
55
<VersionMinor>0</VersionMinor>
66
<VersionSDKMinor>1</VersionSDKMinor>
77
<!-- Use the feature version for each monthly servicng release -->
88
<!-- Use the patch version for intra-monthly releases and hotfixes -->
9-
<VersionFeature>01</VersionFeature>
9+
<VersionFeature>00</VersionFeature>
1010
<VersionPatch>0</VersionPatch>
1111
<!-- Enable to remove prerelease label. -->
1212
<StabilizePackageVersion Condition="'$(StabilizePackageVersion)' == ''">false</StabilizePackageVersion>
13-
<PreReleaseVersionLabel>servicing</PreReleaseVersionLabel>
14-
<PreReleaseVersionIteration Condition="'$(StabilizePackageVersion)' != 'true'">
15-
</PreReleaseVersionIteration>
13+
<PreReleaseVersionLabel>preview</PreReleaseVersionLabel>
14+
<PreReleaseVersionIteration Condition="'$(StabilizePackageVersion)' != 'true'">1</PreReleaseVersionIteration>
1615
</PropertyGroup>
1716
<PropertyGroup>
1817
<VersionPrefix>$(VersionMajor).$(VersionSDKMinor)$(VersionFeature).$(VersionPatch)</VersionPrefix>
@@ -40,33 +39,33 @@
4039
</PropertyGroup>
4140
<PropertyGroup Label="EmscriptenWorkloads">
4241
<!-- Workloads from dotnet/sdk -->
43-
<MicrosoftNETWorkloadEmscriptenCurrentManifest100100PackageVersion>10.0.103</MicrosoftNETWorkloadEmscriptenCurrentManifest100100PackageVersion>
44-
<EmscriptenWorkloadManifestVersion>$(MicrosoftNETWorkloadEmscriptenCurrentManifest100100PackageVersion)</EmscriptenWorkloadManifestVersion>
42+
<MicrosoftNETWorkloadEmscriptenCurrentManifest110100PackageVersion>11.0.100-preview.1.26065.113</MicrosoftNETWorkloadEmscriptenCurrentManifest110100PackageVersion>
43+
<EmscriptenWorkloadManifestVersion>$(MicrosoftNETWorkloadEmscriptenCurrentManifest110100PackageVersion)</EmscriptenWorkloadManifestVersion>
4544
<!-- emsdk workload prerelease version band must match the emsdk feature band -->
46-
<EmscriptenWorkloadFeatureBand>10.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-[A-z]*[\.]*\d*`))</EmscriptenWorkloadFeatureBand>
45+
<EmscriptenWorkloadFeatureBand>11.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-[A-z]*[\.]*\d*`))</EmscriptenWorkloadFeatureBand>
4746
</PropertyGroup>
4847
<PropertyGroup Label="MauiWorkloads">
49-
<MauiFeatureBand>10.0.100</MauiFeatureBand>
50-
<MicrosoftNETSdkAndroidManifest100100PackageVersion>36.1.12</MicrosoftNETSdkAndroidManifest100100PackageVersion>
51-
<MicrosoftNETSdkiOSManifest100100PackageVersion>26.2.10191</MicrosoftNETSdkiOSManifest100100PackageVersion>
52-
<MicrosoftNETSdktvOSManifest100100PackageVersion>26.2.10191</MicrosoftNETSdktvOSManifest100100PackageVersion>
53-
<MicrosoftNETSdkMacCatalystManifest100100PackageVersion>26.2.10191</MicrosoftNETSdkMacCatalystManifest100100PackageVersion>
54-
<MicrosoftNETSdkmacOSManifest100100PackageVersion>26.2.10191</MicrosoftNETSdkmacOSManifest100100PackageVersion>
55-
<MicrosoftNETSdkMauiManifest100100PackageVersion>10.0.30</MicrosoftNETSdkMauiManifest100100PackageVersion>
56-
<MauiWorkloadManifestVersion>$(MicrosoftNETSdkMauiManifest100100PackageVersion)</MauiWorkloadManifestVersion>
57-
<XamarinAndroidWorkloadManifestVersion>$(MicrosoftNETSdkAndroidManifest100100PackageVersion)</XamarinAndroidWorkloadManifestVersion>
58-
<XamarinIOSWorkloadManifestVersion>$(MicrosoftNETSdkiOSManifest100100PackageVersion)</XamarinIOSWorkloadManifestVersion>
59-
<XamarinMacCatalystWorkloadManifestVersion>$(MicrosoftNETSdkMacCatalystManifest100100PackageVersion)</XamarinMacCatalystWorkloadManifestVersion>
60-
<XamarinMacOSWorkloadManifestVersion>$(MicrosoftNETSdkmacOSManifest100100PackageVersion)</XamarinMacOSWorkloadManifestVersion>
61-
<XamarinTvOSWorkloadManifestVersion>$(MicrosoftNETSdktvOSManifest100100PackageVersion)</XamarinTvOSWorkloadManifestVersion>
48+
<MauiFeatureBand>11.0.100-preview.1</MauiFeatureBand>
49+
<MicrosoftNETSdkAndroidManifest110100PackageVersion>36.1.12</MicrosoftNETSdkAndroidManifest110100PackageVersion>
50+
<MicrosoftNETSdkiOSManifest110100PackageVersion>26.2.10191</MicrosoftNETSdkiOSManifest110100PackageVersion>
51+
<MicrosoftNETSdktvOSManifest110100PackageVersion>26.2.10191</MicrosoftNETSdktvOSManifest110100PackageVersion>
52+
<MicrosoftNETSdkMacCatalystManifest110100PackageVersion>26.2.10191</MicrosoftNETSdkMacCatalystManifest110100PackageVersion>
53+
<MicrosoftNETSdkmacOSManifest110100PackageVersion>26.2.10191</MicrosoftNETSdkmacOSManifest110100PackageVersion>
54+
<MicrosoftNETSdkMauiManifest110100PackageVersion>10.0.30</MicrosoftNETSdkMauiManifest110100PackageVersion>
55+
<MauiWorkloadManifestVersion>$(MicrosoftNETSdkMauiManifest110100PackageVersion)</MauiWorkloadManifestVersion>
56+
<XamarinAndroidWorkloadManifestVersion>$(MicrosoftNETSdkAndroidManifest110100PackageVersion)</XamarinAndroidWorkloadManifestVersion>
57+
<XamarinIOSWorkloadManifestVersion>$(MicrosoftNETSdkiOSManifest110100PackageVersion)</XamarinIOSWorkloadManifestVersion>
58+
<XamarinMacCatalystWorkloadManifestVersion>$(MicrosoftNETSdkMacCatalystManifest110100PackageVersion)</XamarinMacCatalystWorkloadManifestVersion>
59+
<XamarinMacOSWorkloadManifestVersion>$(MicrosoftNETSdkmacOSManifest110100PackageVersion)</XamarinMacOSWorkloadManifestVersion>
60+
<XamarinTvOSWorkloadManifestVersion>$(MicrosoftNETSdktvOSManifest110100PackageVersion)</XamarinTvOSWorkloadManifestVersion>
6261
</PropertyGroup>
6362
<PropertyGroup Label="MonoWorkloads">
64-
<MicrosoftNETWorkloadMonoToolchainCurrentManifest100100PackageVersion>10.0.103</MicrosoftNETWorkloadMonoToolchainCurrentManifest100100PackageVersion>
65-
<MicrosoftNETSdkPackageVersion>10.0.103-servicing.26071.104</MicrosoftNETSdkPackageVersion>
63+
<MicrosoftNETWorkloadMonoToolchainCurrentManifest110100PackageVersion>11.0.100-preview.1.26065.113</MicrosoftNETWorkloadMonoToolchainCurrentManifest110100PackageVersion>
64+
<MicrosoftNETSdkPackageVersion>11.0.100-preview.1.26065.113</MicrosoftNETSdkPackageVersion>
6665
<!-- Workloads from dotnet/sdk use MicrosoftNETSdkPackageVersion as the manifests are now built from the dotnet/sdk repo -->
67-
<MonoWorkloadManifestVersion>$(MicrosoftNETWorkloadMonoToolChainCurrentManifest100100PackageVersion)</MonoWorkloadManifestVersion>
66+
<MonoWorkloadManifestVersion>$(MicrosoftNETWorkloadMonoToolChainCurrentManifest110100PackageVersion)</MonoWorkloadManifestVersion>
6867
<!-- mono workload prerelease version band must match the runtime feature band -->
69-
<MonoWorkloadFeatureBand>10.0.100$([System.Text.RegularExpressions.Regex]::Match($(MonoWorkloadManifestVersion), `-[A-z]*[\.]*\d*`))</MonoWorkloadFeatureBand>
68+
<MonoWorkloadFeatureBand>11.0.100$([System.Text.RegularExpressions.Regex]::Match($(MonoWorkloadManifestVersion), `-[A-z]*[\.]*\d*`))</MonoWorkloadFeatureBand>
7069
</PropertyGroup>
7170
<!-- deployment-tools dependencies -->
7271
<PropertyGroup>

0 commit comments

Comments
 (0)