Skip to content

Commit 864fd84

Browse files
committed
Merge branch 'main' into darc-main-f0db065e-1ded-4af0-afff-c9596624497e
# Conflicts: # eng/Version.Details.xml
2 parents 37fbaf6 + 38bb2cc commit 864fd84

File tree

5 files changed

+133
-39
lines changed

5 files changed

+133
-39
lines changed

.azuredevops/dependabot.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
version: 2
2+
3+
# Disabling dependabot on Azure DevOps as this is a mirrored repo. Updates should go through github.
4+
enable-campaigned-updates: false
5+
enable-security-updates: false

NuGet.config

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,15 @@
77
<clear />
88
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
99
<!-- Begin: Package sources from dotnet-dotnet -->
10-
<add key="darc-int-dotnet-dotnet-641b407" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-dotnet-641b407a/nuget/v3/index.json" />
10+
<add key="darc-int-dotnet-dotnet-5426032" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-dotnet-54260329/nuget/v3/index.json" />
1111
<!-- End: Package sources from dotnet-dotnet -->
1212
<!-- Begin: Package sources from dotnet-android -->
13-
<add key="darc-pub-dotnet-android-f90e889" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-android-f90e889a/nuget/v3/index.json" />
14-
<add key="darc-pub-dotnet-android-f90e889-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-android-f90e889a-1/nuget/v3/index.json" />
1513
<!-- End: Package sources from dotnet-android -->
1614
<!-- Begin: Package sources from dotnet-macios -->
17-
<add key="darc-pub-dotnet-macios-6d121e9" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-macios-6d121e9d/nuget/v3/index.json" />
15+
<add key="darc-pub-dotnet-macios-29d3d81" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-macios-29d3d81f/nuget/v3/index.json" />
1816
<!-- End: Package sources from dotnet-macios -->
1917
<!-- Begin: Package sources from dotnet-maui -->
20-
<add key="darc-pub-dotnet-maui-d9f2e2f" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-maui-d9f2e2f6/nuget/v3/index.json" />
18+
<add key="darc-pub-dotnet-maui-c1c069a" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-maui-c1c069ac/nuget/v3/index.json" />
2119
<!-- End: Package sources from dotnet-maui -->
2220
<!-- Begin: Package sources from dotnet-emsdk -->
2321
<!-- End: Package sources from dotnet-emsdk -->
@@ -38,7 +36,7 @@
3836
<clear />
3937
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
4038
<!-- Begin: Package sources from dotnet-dotnet -->
41-
<add key="darc-int-dotnet-dotnet-641b407" value="true" />
39+
<add key="darc-int-dotnet-dotnet-5426032" value="true" />
4240
<!-- End: Package sources from dotnet-dotnet -->
4341
<!-- Begin: Package sources from dotnet-maui -->
4442
<!-- End: Package sources from dotnet-maui -->

doc/test-workload-updates.md

Lines changed: 91 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,91 @@
1+
# Test Workload Updates Process
2+
3+
This document provides instructions for the MAUI, Android, and iOS teams on how to create test workload sets for validation and testing purposes.
4+
5+
## Overview
6+
7+
Test workload sets allow teams to validate workload updates before they are included in official releases. This process supports two main scenarios:
8+
1. Creating test workload sets for general validation
9+
2. Creating test workload sets with Visual Studio insertion for integration testing
10+
11+
## Prerequisites
12+
13+
- Access to the workload-versions repository
14+
- Permissions to create branches and pull requests
15+
- Access to Azure DevOps internal builds
16+
17+
## Process Steps
18+
19+
### 1. Create a Test Branch
20+
21+
1. **Branch from a release branch**: Start by creating a test branch from one of the existing release branches
22+
```
23+
Example branch name: release/9.0.3xx-mauitest
24+
```
25+
26+
**Branch naming convention:**
27+
- `release/{version}/mauitest{mauiversion}` - for MAUI team tests
28+
- `release/{version}/androidtest{androidversion}` - for Android team tests
29+
- `release/{version}/iostest{iosversion}` - for iOS team tests
30+
31+
2. **Make your changes**: Update the necessary workload configurations in your test branch
32+
33+
### 2. Create and Merge Pull Request
34+
35+
1. **Publish your test build to a Darc channel**: After making changes, publish the build artifacts to a dedicated Darc channel for test workloads.
36+
2. **Use `darc update-dependencies`**: Run `darc update-dependencies` to update your test branch with the new build information from the Darc channel. This ensures your branch references the correct test workload versions.
37+
3. **Get approval** from the appropriate reviewers
38+
4. **Merge the PR** once approved
39+
40+
> **Note**: Once the test pipeline is established, PRs will not be required and teams can push directly to the internal Azure DevOps repository.
41+
42+
### 3. Queue Internal Build
43+
44+
After merging your PR, queue an internal build using the Azure DevOps pipeline.
45+
https://dev.azure.com/dnceng/internal/_build?definitionId=1298
46+
47+
## Build Configuration Options
48+
49+
When queuing the pipeline, you have several configuration options depending on your testing needs:
50+
51+
### For Test Workload Sets Only
52+
53+
If you only need to create a test workload set:
54+
55+
1.**Select pipeline version by branch/tag** set to **eng**
56+
2.**🚩 Source branch 🚩** set to your branch
57+
3.**Select "Publish to AzDO"** when queuing the pipeline
58+
4.**AzDO publish feed** is the feed it'll publish the workload set to. Default should be _dotnet-workloads_.
59+
5.**⭐ Create a test workload set** enabled
60+
- This will generate the test workload set for validation that is of the form
61+
- The workload set will be published to Azure DevOps for testing
62+
63+
### For Visual Studio Insertion Testing
64+
65+
If you need to test a Visual Studio insertion:
66+
67+
1.**Update the workload drop names** for the workloads you want to update in VS
68+
2.**Update the primary VS insertion branch** configuration
69+
3.**Check the box for "Create VS insertion"**
70+
71+
This configuration will:
72+
- Create the test workload set
73+
- Prepare the workloads for VS insertion
74+
- Initiate the insertion process into the specified VS branch
75+
76+
## Important Notes
77+
78+
- **Branch Management**: Keep test branches organized and clean up after testing is complete
79+
- **Communication**: Coordinate with other teams if multiple test branches are being used simultaneously
80+
81+
## Troubleshooting
82+
83+
If you encounter issues during the process:
84+
85+
1. **Build Failures**: Check the build logs in Azure DevOps for specific error messages
86+
2. **Permission Issues**: Ensure you have the necessary access rights for the repositories and pipelines
87+
4. **Workload Set Versioning**: The workload set created will match the SDK band specified in the `Versions.props` file.
88+
89+
## Support
90+
91+
For additional support or questions about this process, please reach out to the .NET SDK team on our Teams chat.

eng/Version.Details.xml

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,48 +1,48 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Dependencies>
33
<ProductDependencies>
4-
<Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-10.0.100.Transport" Version="10.0.100-rtm.25521.108">
4+
<Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-10.0.100" Version="10.0.101">
55
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet</Uri>
6-
<Sha>641b407a46641d35d7ddb96b8a6df74f76c8429f</Sha>
6+
<Sha>5426032943ac0fa8c62e975d599d93fc56e91214</Sha>
77
<SourceBuild RepoName="emsdk" ManagedOnly="true" />
88
</Dependency>
9-
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.0">
9+
<Dependency Name="Microsoft.NET.Workload.Mono.Toolchain.Current.Manifest-10.0.100" Version="10.0.101">
1010
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet</Uri>
11-
<Sha>641b407a46641d35d7ddb96b8a6df74f76c8429f</Sha>
11+
<Sha>5426032943ac0fa8c62e975d599d93fc56e91214</Sha>
1212
</Dependency>
13-
<Dependency Name="Microsoft.NET.Sdk.Android.Manifest-10.0.100" Version="36.0.14">
13+
<Dependency Name="Microsoft.NET.Sdk.Android.Manifest-10.0.100" Version="36.1.2">
1414
<Uri>https://github.com/dotnet/android</Uri>
15-
<Sha>f90e889aa8ed2ef666bf58badf601163be0e501a</Sha>
15+
<Sha>01024bb616e7b80417a2c6d320885bfdb956f20a</Sha>
1616
</Dependency>
17-
<Dependency Name="Microsoft.NET.Sdk.iOS.Manifest-10.0.100" Version="26.0.11010">
17+
<Dependency Name="Microsoft.NET.Sdk.iOS.Manifest-10.0.100" Version="26.1.10502">
1818
<Uri>https://github.com/dotnet/macios</Uri>
19-
<Sha>6d121e9ddabc40b5ba5de2fc4c195fa772736210</Sha>
19+
<Sha>29d3d81f416abddb44209f488673afe56077cd27</Sha>
2020
</Dependency>
21-
<Dependency Name="Microsoft.NET.Sdk.tvOS.Manifest-10.0.100" Version="26.0.11010">
21+
<Dependency Name="Microsoft.NET.Sdk.tvOS.Manifest-10.0.100" Version="26.1.10502">
2222
<Uri>https://github.com/dotnet/macios</Uri>
23-
<Sha>6d121e9ddabc40b5ba5de2fc4c195fa772736210</Sha>
23+
<Sha>29d3d81f416abddb44209f488673afe56077cd27</Sha>
2424
</Dependency>
25-
<Dependency Name="Microsoft.NET.Sdk.MacCatalyst.Manifest-10.0.100" Version="26.0.11010">
25+
<Dependency Name="Microsoft.NET.Sdk.MacCatalyst.Manifest-10.0.100" Version="26.1.10502">
2626
<Uri>https://github.com/dotnet/macios</Uri>
27-
<Sha>6d121e9ddabc40b5ba5de2fc4c195fa772736210</Sha>
27+
<Sha>29d3d81f416abddb44209f488673afe56077cd27</Sha>
2828
</Dependency>
29-
<Dependency Name="Microsoft.NET.Sdk.macOS.Manifest-10.0.100" Version="26.0.11010">
29+
<Dependency Name="Microsoft.NET.Sdk.macOS.Manifest-10.0.100" Version="26.1.10502">
3030
<Uri>https://github.com/dotnet/macios</Uri>
31-
<Sha>6d121e9ddabc40b5ba5de2fc4c195fa772736210</Sha>
31+
<Sha>29d3d81f416abddb44209f488673afe56077cd27</Sha>
3232
</Dependency>
33-
<Dependency Name="Microsoft.NET.Sdk.Maui.Manifest-10.0.100" Version="10.0.0">
33+
<Dependency Name="Microsoft.NET.Sdk.Maui.Manifest-10.0.100" Version="10.0.1">
3434
<Uri>https://github.com/dotnet/maui</Uri>
35-
<Sha>d9f2e2f6ef58af3d580242dfcac2fbe1b242e484</Sha>
35+
<Sha>c1c069ac0957d8241f5714c4700855728eeb6216</Sha>
3636
</Dependency>
37-
<Dependency Name="Microsoft.NET.Sdk" Version="10.0.100-rtm.25521.108">
37+
<Dependency Name="Microsoft.NET.Sdk" Version="10.0.101-servicing.25567.113">
3838
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet</Uri>
39-
<Sha>641b407a46641d35d7ddb96b8a6df74f76c8429f</Sha>
39+
<Sha>5426032943ac0fa8c62e975d599d93fc56e91214</Sha>
4040
</Dependency>
4141
</ProductDependencies>
4242
<ToolsetDependencies>
43-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25555.6">
44-
<Uri>https://github.com/dotnet/arcade</Uri>
45-
<Sha>987d1a73ea67d323c0fc7537bce8ec65d87eb43f</Sha>
43+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25567.113">
44+
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet</Uri>
45+
<Sha>5426032943ac0fa8c62e975d599d93fc56e91214</Sha>
4646
<SourceBuild RepoName="arcade" ManagedOnly="true" />
4747
</Dependency>
4848
</ToolsetDependencies>

eng/Versions.props

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
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>00</VersionFeature>
9+
<VersionFeature>01</VersionFeature>
1010
<VersionPatch>0</VersionPatch>
1111
<!-- Enable to remove prerelease label. -->
1212
<StabilizePackageVersion Condition="'$(StabilizePackageVersion)' == ''">false</StabilizePackageVersion>
@@ -40,19 +40,19 @@
4040
</PropertyGroup>
4141
<PropertyGroup Label="EmscriptenWorkloads">
4242
<!-- Workloads from dotnet/sdk -->
43-
<MicrosoftNETWorkloadEmscriptenCurrentManifest100100TransportPackageVersion>10.0.100-rtm.25521.108</MicrosoftNETWorkloadEmscriptenCurrentManifest100100TransportPackageVersion>
44-
<EmscriptenWorkloadManifestVersion>$(MicrosoftNETWorkloadEmscriptenCurrentManifest100100TransportPackageVersion)</EmscriptenWorkloadManifestVersion>
43+
<MicrosoftNETWorkloadEmscriptenCurrentManifest100100PackageVersion>10.0.101</MicrosoftNETWorkloadEmscriptenCurrentManifest100100PackageVersion>
44+
<EmscriptenWorkloadManifestVersion>$(MicrosoftNETWorkloadEmscriptenCurrentManifest100100PackageVersion)</EmscriptenWorkloadManifestVersion>
4545
<!-- emsdk workload prerelease version band must match the emsdk feature band -->
4646
<EmscriptenWorkloadFeatureBand>10.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-[A-z]*[\.]*\d*`))</EmscriptenWorkloadFeatureBand>
4747
</PropertyGroup>
4848
<PropertyGroup Label="MauiWorkloads">
4949
<MauiFeatureBand>10.0.100</MauiFeatureBand>
50-
<MicrosoftNETSdkAndroidManifest100100PackageVersion>36.0.14</MicrosoftNETSdkAndroidManifest100100PackageVersion>
51-
<MicrosoftNETSdkiOSManifest100100PackageVersion>26.0.11010</MicrosoftNETSdkiOSManifest100100PackageVersion>
52-
<MicrosoftNETSdktvOSManifest100100PackageVersion>26.0.11010</MicrosoftNETSdktvOSManifest100100PackageVersion>
53-
<MicrosoftNETSdkMacCatalystManifest100100PackageVersion>26.0.11010</MicrosoftNETSdkMacCatalystManifest100100PackageVersion>
54-
<MicrosoftNETSdkmacOSManifest100100PackageVersion>26.0.11010</MicrosoftNETSdkmacOSManifest100100PackageVersion>
55-
<MicrosoftNETSdkMauiManifest100100PackageVersion>10.0.0</MicrosoftNETSdkMauiManifest100100PackageVersion>
50+
<MicrosoftNETSdkAndroidManifest100100PackageVersion>36.1.2</MicrosoftNETSdkAndroidManifest100100PackageVersion>
51+
<MicrosoftNETSdkiOSManifest100100PackageVersion>26.1.10502</MicrosoftNETSdkiOSManifest100100PackageVersion>
52+
<MicrosoftNETSdktvOSManifest100100PackageVersion>26.1.10502</MicrosoftNETSdktvOSManifest100100PackageVersion>
53+
<MicrosoftNETSdkMacCatalystManifest100100PackageVersion>26.1.10502</MicrosoftNETSdkMacCatalystManifest100100PackageVersion>
54+
<MicrosoftNETSdkmacOSManifest100100PackageVersion>26.1.10502</MicrosoftNETSdkmacOSManifest100100PackageVersion>
55+
<MicrosoftNETSdkMauiManifest100100PackageVersion>10.0.1</MicrosoftNETSdkMauiManifest100100PackageVersion>
5656
<MauiWorkloadManifestVersion>$(MicrosoftNETSdkMauiManifest100100PackageVersion)</MauiWorkloadManifestVersion>
5757
<XamarinAndroidWorkloadManifestVersion>$(MicrosoftNETSdkAndroidManifest100100PackageVersion)</XamarinAndroidWorkloadManifestVersion>
5858
<XamarinIOSWorkloadManifestVersion>$(MicrosoftNETSdkiOSManifest100100PackageVersion)</XamarinIOSWorkloadManifestVersion>
@@ -61,10 +61,10 @@
6161
<XamarinTvOSWorkloadManifestVersion>$(MicrosoftNETSdktvOSManifest100100PackageVersion)</XamarinTvOSWorkloadManifestVersion>
6262
</PropertyGroup>
6363
<PropertyGroup Label="MonoWorkloads">
64-
<MicrosoftNETCoreAppRefPackageVersion>10.0.0</MicrosoftNETCoreAppRefPackageVersion>
65-
<MicrosoftNETSdkPackageVersion>10.0.100-rtm.25521.108</MicrosoftNETSdkPackageVersion>
64+
<MicrosoftNETWorkloadMonoToolchainCurrentManifest100100PackageVersion>10.0.101</MicrosoftNETWorkloadMonoToolchainCurrentManifest100100PackageVersion>
65+
<MicrosoftNETSdkPackageVersion>10.0.101-servicing.25567.113</MicrosoftNETSdkPackageVersion>
6666
<!-- Workloads from dotnet/sdk use MicrosoftNETSdkPackageVersion as the manifests are now built from the dotnet/sdk repo -->
67-
<MonoWorkloadManifestVersion>$(MicrosoftNETSdkPackageVersion)</MonoWorkloadManifestVersion>
67+
<MonoWorkloadManifestVersion>$(MicrosoftNETWorkloadMonoToolChainCurrentManifest100100PackageVersion)</MonoWorkloadManifestVersion>
6868
<!-- mono workload prerelease version band must match the runtime feature band -->
6969
<MonoWorkloadFeatureBand>10.0.100$([System.Text.RegularExpressions.Regex]::Match($(MonoWorkloadManifestVersion), `-[A-z]*[\.]*\d*`))</MonoWorkloadFeatureBand>
7070
</PropertyGroup>

0 commit comments

Comments
 (0)