Skip to content

Commit 573de13

Browse files
MiYanniMiYanni
committed
Merge branch 'main' into feature/workload-publish-main2
# Conflicts: # eng/Version.Details.xml # eng/Versions.props # eng/pipelines/official.yml
2 parents a00e952 + 1f44bc4 commit 573de13

File tree

4 files changed

+42
-42
lines changed

4 files changed

+42
-42
lines changed

‎NuGet.config

Lines changed: 12 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -7,30 +7,27 @@
77
<clear />
88
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
99
<!-- Begin: Package sources from dotnet-android -->
10+
<add key="darc-pub-dotnet-android-0ccdc57" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-android-0ccdc57c/nuget/v3/index.json" />
1011
<!-- End: Package sources from dotnet-android -->
1112
<!-- Begin: Package sources from dotnet-maui -->
1213
<add key="darc-pub-dotnet-maui-85f2a06" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-maui-85f2a06e/nuget/v3/index.json" />
1314
<!-- End: Package sources from dotnet-maui -->
1415
<!-- Begin: Package sources from dotnet-aspire -->
1516
<!-- End: Package sources from dotnet-aspire -->
1617
<!-- Begin: Package sources from dotnet-emsdk -->
17-
<add key="darc-pub-dotnet-emsdk-4c9d1b1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-4c9d1b11/nuget/v3/index.json" />
18-
<add key="darc-pub-dotnet-emsdk-4c9d1b1-8" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-4c9d1b11-8/nuget/v3/index.json" />
19-
<add key="darc-pub-dotnet-emsdk-4c9d1b1-7" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-4c9d1b11-7/nuget/v3/index.json" />
20-
<add key="darc-pub-dotnet-emsdk-4c9d1b1-6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-4c9d1b11-6/nuget/v3/index.json" />
21-
<add key="darc-pub-dotnet-emsdk-4c9d1b1-5" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-4c9d1b11-5/nuget/v3/index.json" />
22-
<add key="darc-pub-dotnet-emsdk-4c9d1b1-4" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-4c9d1b11-4/nuget/v3/index.json" />
23-
<add key="darc-pub-dotnet-emsdk-4c9d1b1-3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-4c9d1b11-3/nuget/v3/index.json" />
24-
<add key="darc-pub-dotnet-emsdk-4c9d1b1-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-4c9d1b11-2/nuget/v3/index.json" />
25-
<add key="darc-pub-dotnet-emsdk-4c9d1b1-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-4c9d1b11-1/nuget/v3/index.json" />
18+
<add key="darc-pub-dotnet-emsdk-2c27e40" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-2c27e405/nuget/v3/index.json" />
19+
<add key="darc-pub-dotnet-emsdk-2c27e40-3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-2c27e405-3/nuget/v3/index.json" />
20+
<add key="darc-pub-dotnet-emsdk-2c27e40-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-2c27e405-2/nuget/v3/index.json" />
21+
<add key="darc-pub-dotnet-emsdk-2c27e40-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-2c27e405-1/nuget/v3/index.json" />
2622
<!-- End: Package sources from dotnet-emsdk -->
2723
<!-- Begin: Package sources from dotnet-runtime -->
28-
<add key="darc-int-dotnet-runtime-c8acea2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-c8acea22/nuget/v3/index.json" />
29-
<add key="darc-int-dotnet-runtime-c8acea2-8" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-c8acea22-8/nuget/v3/index.json" />
30-
<add key="darc-int-dotnet-runtime-c8acea2-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-c8acea22-3/nuget/v3/index.json" />
24+
<add key="darc-int-dotnet-runtime-80aa709" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-80aa709f/nuget/v3/index.json" />
25+
<add key="darc-int-dotnet-runtime-80aa709-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-80aa709f-2/nuget/v3/index.json" />
3126
<!-- End: Package sources from dotnet-runtime -->
3227
<!-- Begin: Package sources from xamarin-xamarin-macios -->
33-
<add key="darc-pub-xamarin-xamarin-macios-4c5dd93" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-xamarin-xamarin-macios-4c5dd937/nuget/v3/index.json" />
28+
<add key="darc-pub-xamarin-xamarin-macios-b3ee0f2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-xamarin-xamarin-macios-b3ee0f24/nuget/v3/index.json" />
29+
<add key="darc-pub-xamarin-xamarin-macios-b3ee0f2-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-xamarin-xamarin-macios-b3ee0f24-2/nuget/v3/index.json" />
30+
<add key="darc-pub-xamarin-xamarin-macios-b3ee0f2-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-xamarin-xamarin-macios-b3ee0f24-1/nuget/v3/index.json" />
3431
<!-- End: Package sources from xamarin-xamarin-macios -->
3532
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
3633
<add key="dotnet-public" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json" />
@@ -49,9 +46,8 @@
4946
<!-- Begin: Package sources from dotnet-maui -->
5047
<!-- End: Package sources from dotnet-maui -->
5148
<!-- Begin: Package sources from dotnet-runtime -->
52-
<add key="darc-int-dotnet-runtime-c8acea2-3" value="true" />
53-
<add key="darc-int-dotnet-runtime-c8acea2-8" value="true" />
54-
<add key="darc-int-dotnet-runtime-c8acea2" value="true" />
49+
<add key="darc-int-dotnet-runtime-80aa709-2" value="true" />
50+
<add key="darc-int-dotnet-runtime-80aa709" value="true" />
5551
<!-- End: Package sources from dotnet-runtime -->
5652
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
5753
</disabledPackageSources>

‎eng/Version.Details.xml

Lines changed: 16 additions & 16 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-9.0.100" Version="9.0.1" CoherentParentDependency="Microsoft.NET.Sdk">
4+
<Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100" Version="9.0.2" CoherentParentDependency="Microsoft.NET.Sdk">
55
<Uri>https://github.com/dotnet/emsdk</Uri>
6-
<Sha>763d10a1a251be35337ee736832bfde3f9200672</Sha>
6+
<Sha>2c27e405e17595694d91892159593d6dd10e61e2</Sha>
77
<SourceBuild RepoName="emsdk" ManagedOnly="true" />
88
</Dependency>
9-
<Dependency Name="Microsoft.NETCore.App.Ref" Version="9.0.1" CoherentParentDependency="Microsoft.NET.Sdk">
9+
<Dependency Name="Microsoft.NETCore.App.Ref" Version="9.0.2" CoherentParentDependency="Microsoft.NET.Sdk">
1010
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
11-
<Sha>9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3</Sha>
11+
<Sha>80aa709f5d919c6814726788dc6dabe23e79e672</Sha>
1212
</Dependency>
13-
<Dependency Name="Microsoft.NET.Sdk.Android.Manifest-9.0.100" Version="35.99.0-ci.dev-pjc-msi-zip-artifact.29">
13+
<Dependency Name="Microsoft.NET.Sdk.Android.Manifest-9.0.100" Version="35.0.39">
1414
<Uri>https://github.com/dotnet/android</Uri>
15-
<Sha>b1501efd4a9cb8c48f58c6a099fda120841b7ec8</Sha>
15+
<Sha>0ccdc57cf7fc59bd3f6cbf900c9cdbebadfe4609</Sha>
1616
</Dependency>
17-
<Dependency Name="Microsoft.NET.Sdk.iOS.Manifest-9.0.100" Version="18.2.9170">
17+
<Dependency Name="Microsoft.NET.Sdk.iOS.Manifest-9.0.100" Version="18.2.9173">
1818
<Uri>https://github.com/xamarin/xamarin-macios</Uri>
19-
<Sha>4c5dd937c3705d1f784a877a9af3219709d6b700</Sha>
19+
<Sha>b3ee0f2422cd950a0c0c676fb8ac9e7dc5f98290</Sha>
2020
</Dependency>
21-
<Dependency Name="Microsoft.NET.Sdk.tvOS.Manifest-9.0.100" Version="18.2.9170">
21+
<Dependency Name="Microsoft.NET.Sdk.tvOS.Manifest-9.0.100" Version="18.2.9173">
2222
<Uri>https://github.com/xamarin/xamarin-macios</Uri>
23-
<Sha>4c5dd937c3705d1f784a877a9af3219709d6b700</Sha>
23+
<Sha>b3ee0f2422cd950a0c0c676fb8ac9e7dc5f98290</Sha>
2424
</Dependency>
25-
<Dependency Name="Microsoft.NET.Sdk.MacCatalyst.Manifest-9.0.100" Version="18.2.9170">
25+
<Dependency Name="Microsoft.NET.Sdk.MacCatalyst.Manifest-9.0.100" Version="18.2.9173">
2626
<Uri>https://github.com/xamarin/xamarin-macios</Uri>
27-
<Sha>4c5dd937c3705d1f784a877a9af3219709d6b700</Sha>
27+
<Sha>b3ee0f2422cd950a0c0c676fb8ac9e7dc5f98290</Sha>
2828
</Dependency>
29-
<Dependency Name="Microsoft.NET.Sdk.macOS.Manifest-9.0.100" Version="15.2.9170">
29+
<Dependency Name="Microsoft.NET.Sdk.macOS.Manifest-9.0.100" Version="15.2.9173">
3030
<Uri>https://github.com/xamarin/xamarin-macios</Uri>
31-
<Sha>4c5dd937c3705d1f784a877a9af3219709d6b700</Sha>
31+
<Sha>b3ee0f2422cd950a0c0c676fb8ac9e7dc5f98290</Sha>
3232
</Dependency>
3333
<Dependency Name="Microsoft.NET.Sdk.Maui.Manifest-9.0.100" Version="9.0.14">
3434
<Uri>https://github.com/dotnet/maui</Uri>
3535
<Sha>85f2a06ecd11e4ba5a9e567d86f9d2fb49a2c5ca</Sha>
3636
</Dependency>
37-
<Dependency Name="Microsoft.NET.Sdk" Version="9.0.102-servicing.24612.26">
37+
<Dependency Name="Microsoft.NET.Sdk" Version="9.0.103-servicing.25071.13">
3838
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
39-
<Sha>69bc545cb48ad0db656a2b66f4e01265217e7890</Sha>
39+
<Sha>96da45d427abd4d74c27960061daf18b51cd474f</Sha>
4040
</Dependency>
4141
</ProductDependencies>
4242
<ToolsetDependencies>

‎eng/Versions.props

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<!-- Use the feature version for each monthly servicng release -->
1212
<!-- Use the patch version for intra-monthly releases and hotfixes -->
1313
<VersionFeature>02</VersionFeature>
14-
<VersionPatch>0</VersionPatch>
14+
<VersionPatch>1</VersionPatch>
1515
<!-- Enable to remove prerelease label. -->
1616
<StabilizePackageVersion Condition="'$(StabilizePackageVersion)' == ''">false</StabilizePackageVersion>
1717
<PreReleaseVersionLabel>servicing</PreReleaseVersionLabel>
@@ -22,6 +22,11 @@
2222
<VersionSDKMinor>2</VersionSDKMinor>
2323
<VersionFeature>00</VersionFeature>
2424
<VersionPatch>0</VersionPatch>
25+
</PropertyGroup>
26+
<PropertyGroup Condition="'$(FeatureBand)' == '9.0.300'">
27+
<VersionSDKMinor>3</VersionSDKMinor>
28+
<VersionFeature>00</VersionFeature>
29+
<VersionPatch>0</VersionPatch>
2530
<StabilizePackageVersion>false</StabilizePackageVersion>
2631
<!-- Calculate prerelease label
2732
Use preview and prerelease version 0 for SDK feature band previews
@@ -55,18 +60,18 @@
5560
</PropertyGroup>
5661
<PropertyGroup Label="EmscriptenWorkloads">
5762
<!-- Workloads from dotnet/emsdk -->
58-
<MicrosoftNETWorkloadEmscriptenCurrentManifest90100PackageVersion>9.0.1</MicrosoftNETWorkloadEmscriptenCurrentManifest90100PackageVersion>
63+
<MicrosoftNETWorkloadEmscriptenCurrentManifest90100PackageVersion>9.0.2</MicrosoftNETWorkloadEmscriptenCurrentManifest90100PackageVersion>
5964
<EmscriptenWorkloadManifestVersion>$(MicrosoftNETWorkloadEmscriptenCurrentManifest90100PackageVersion)</EmscriptenWorkloadManifestVersion>
6065
<!-- emsdk workload prerelease version band must match the emsdk feature band -->
6166
<EmscriptenWorkloadFeatureBand>9.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-[A-z]*[\.]*\d*`))</EmscriptenWorkloadFeatureBand>
6267
</PropertyGroup>
6368
<PropertyGroup Label="MauiWorkloads">
6469
<MauiFeatureBand>9.0.100</MauiFeatureBand>
65-
<MicrosoftNETSdkAndroidManifest90100PackageVersion>35.99.0-ci.dev-pjc-msi-zip-artifact.29</MicrosoftNETSdkAndroidManifest90100PackageVersion>
66-
<MicrosoftNETSdkiOSManifest90100PackageVersion>18.2.9170</MicrosoftNETSdkiOSManifest90100PackageVersion>
67-
<MicrosoftNETSdktvOSManifest90100PackageVersion>18.2.9170</MicrosoftNETSdktvOSManifest90100PackageVersion>
68-
<MicrosoftNETSdkMacCatalystManifest90100PackageVersion>18.2.9170</MicrosoftNETSdkMacCatalystManifest90100PackageVersion>
69-
<MicrosoftNETSdkmacOSManifest90100PackageVersion>15.2.9170</MicrosoftNETSdkmacOSManifest90100PackageVersion>
70+
<MicrosoftNETSdkAndroidManifest90100PackageVersion>35.0.39</MicrosoftNETSdkAndroidManifest90100PackageVersion>
71+
<MicrosoftNETSdkiOSManifest90100PackageVersion>18.2.9173</MicrosoftNETSdkiOSManifest90100PackageVersion>
72+
<MicrosoftNETSdktvOSManifest90100PackageVersion>18.2.9173</MicrosoftNETSdktvOSManifest90100PackageVersion>
73+
<MicrosoftNETSdkMacCatalystManifest90100PackageVersion>18.2.9173</MicrosoftNETSdkMacCatalystManifest90100PackageVersion>
74+
<MicrosoftNETSdkmacOSManifest90100PackageVersion>15.2.9173</MicrosoftNETSdkmacOSManifest90100PackageVersion>
7075
<MicrosoftNETSdkMauiManifest90100PackageVersion>9.0.14</MicrosoftNETSdkMauiManifest90100PackageVersion>
7176
<MauiWorkloadManifestVersion>$(MicrosoftNETSdkMauiManifest90100PackageVersion)</MauiWorkloadManifestVersion>
7277
<XamarinAndroidWorkloadManifestVersion>$(MicrosoftNETSdkAndroidManifest90100PackageVersion)</XamarinAndroidWorkloadManifestVersion>
@@ -76,7 +81,7 @@
7681
<XamarinTvOSWorkloadManifestVersion>$(MicrosoftNETSdktvOSManifest90100PackageVersion)</XamarinTvOSWorkloadManifestVersion>
7782
</PropertyGroup>
7883
<PropertyGroup Label="MonoWorkloads">
79-
<MicrosoftNETCoreAppRefPackageVersion>9.0.1</MicrosoftNETCoreAppRefPackageVersion>
84+
<MicrosoftNETCoreAppRefPackageVersion>9.0.2</MicrosoftNETCoreAppRefPackageVersion>
8085
<!-- Workloads from dotnet/runtime use MicrosoftNETCoreAppRefPackageVersion because it has a stable name that does not include the full feature band -->
8186
<MonoWorkloadManifestVersion>$(MicrosoftNETCoreAppRefPackageVersion)</MonoWorkloadManifestVersion>
8287
<!-- mono workload prerelease version band must match the runtime feature band -->

‎eng/pipelines/official.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ parameters:
4040
default:
4141
- emsdk
4242
- mono
43-
- android
4443
# These insert (pre)components & packs into VS.
4544
- name: primaryVsInsertionBranches
4645
displayName: Primary VS insertion branches
@@ -112,4 +111,4 @@ extends:
112111
vsTopicBranch: ${{ parameters.vsTopicBranch }}
113112
workloadDropNames: ${{ parameters.workloadDropNames }}
114113
primaryVsInsertionBranches: ${{ parameters.primaryVsInsertionBranches }}
115-
secondaryVsInsertionBranches: ${{ parameters.secondaryVsInsertionBranches }}
114+
secondaryVsInsertionBranches: ${{ parameters.secondaryVsInsertionBranches }}

0 commit comments

Comments
 (0)