Skip to content

Commit 1c37787

Browse files
marcpopMSFTmarcpopMSFT
authored
Merge branch 'release/10.0.2xx' into marcpopMSFT-implicitversionsOctober
2 parents fef27d6 + 9e81ef5 commit 1c37787

File tree

101 files changed

+1283
-751
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

101 files changed

+1283
-751
lines changed

‎.github/copilot-instructions.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,3 +31,8 @@ Localization:
3131

3232
Documentation:
3333
- Do not manually edit files under documentation/manpages/sdk as these are generated based on documentation and should not be manually modified.
34+
35+
External Dependencies:
36+
- Changes that require modifications to the dotnet/templating repository (Microsoft.TemplateEngine packages) should be made directly in that repository, not worked around in this repo.
37+
- The dotnet/templating repository owns the TemplateEngine.Edge, TemplateEngine.Abstractions, and related packages.
38+
- If a change requires updates to template engine behavior or formatting (e.g., DisplayName properties), file an issue in dotnet/templating and make the changes there rather than adding workarounds in this SDK repository.

‎.vsts-ci.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ extends:
9898
name: $(DncEngInternalBuildPool)
9999
image: windows.vs2022.amd64
100100
os: windows
101-
helixTargetQueue: windows.amd64.vs2022.pre
101+
helixTargetQueue: windows.amd64.vs2026.pre.scout
102102
oneESCompat:
103103
templateFolderName: templates-official
104104
publishTaskPrefix: 1ES.

‎.vsts-pr.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ stages:
4242
name: $(DncEngPublicBuildPool)
4343
demands: ImageOverride -equals windows.vs2022.amd64.open
4444
os: windows
45-
helixTargetQueue: windows.amd64.vs2022.pre.open
45+
helixTargetQueue: windows.amd64.vs2026.pre.scout.open
4646

4747
############### LINUX ###############
4848
- template: /eng/pipelines/templates/jobs/sdk-job-matrix.yml

‎NuGet.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<clear />
55
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
66
<!-- Begin: Package sources from dotnet-dotnet -->
7-
<add key="darc-pub-dotnet-dotnet-03ebd38" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-dotnet-03ebd38e/nuget/v3/index.json" />
7+
<add key="darc-pub-dotnet-dotnet-79c85d9" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-dotnet-79c85d96/nuget/v3/index.json" />
88
<!-- End: Package sources from dotnet-dotnet -->
99
<!-- Begin: Package sources from microsoft-testfx -->
1010
<!-- End: Package sources from microsoft-testfx -->

‎eng/Version.Details.props‎

Lines changed: 71 additions & 71 deletions
Large diffs are not rendered by default.

‎eng/Version.Details.xml‎

Lines changed: 204 additions & 204 deletions
Large diffs are not rendered by default.

‎eng/Versions.props‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@
4444
referenced by the same 7.0 SDK that references the 7.0.VersionFeature70 runtime pack. -->
4545
<_NET70ILLinkPackVersion>7.0.100-1.23211.1</_NET70ILLinkPackVersion>
4646
<!-- workload-specific version information -->
47-
<VersionFeature80ForWorkloads>$([MSBuild]::Add($(VersionFeature80), 1))</VersionFeature80ForWorkloads>
48-
<VersionFeature90ForWorkloads>$([MSBuild]::Add($(VersionFeature90), 1))</VersionFeature90ForWorkloads>
47+
<VersionFeature80ForWorkloads>$(VersionFeature80)</VersionFeature80ForWorkloads>
48+
<VersionFeature90ForWorkloads>$(VersionFeature90)</VersionFeature90ForWorkloads>
4949
</PropertyGroup>
5050
<PropertyGroup Label="Restore feeds">
5151
<!-- In an orchestrated build, this may be overridden to other Azure feeds. -->
@@ -142,13 +142,13 @@
142142
<BenchmarkDotNetPackageVersion>0.14.0</BenchmarkDotNetPackageVersion>
143143
</PropertyGroup>
144144
<PropertyGroup Label="Workload manifest package versions">
145-
<MauiFeatureBand>10.0.100-preview.6</MauiFeatureBand>
146-
<MauiWorkloadManifestVersion>10.0.0-preview.6.25359.8</MauiWorkloadManifestVersion>
147-
<XamarinAndroidWorkloadManifestVersion>36.0.0-preview.6.169</XamarinAndroidWorkloadManifestVersion>
148-
<XamarinIOSWorkloadManifestVersion>18.5.10415-net10-p6</XamarinIOSWorkloadManifestVersion>
149-
<XamarinMacCatalystWorkloadManifestVersion>18.5.10415-net10-p6</XamarinMacCatalystWorkloadManifestVersion>
150-
<XamarinMacOSWorkloadManifestVersion>15.5.10415-net10-p6</XamarinMacOSWorkloadManifestVersion>
151-
<XamarinTvOSWorkloadManifestVersion>18.5.10415-net10-p6</XamarinTvOSWorkloadManifestVersion>
145+
<MauiFeatureBand>10.0.100-rc.2</MauiFeatureBand>
146+
<MauiWorkloadManifestVersion>10.0.0-rc.2.25504.7</MauiWorkloadManifestVersion>
147+
<XamarinAndroidWorkloadManifestVersion>36.0.0-rc.2.332</XamarinAndroidWorkloadManifestVersion>
148+
<XamarinIOSWorkloadManifestVersion>26.0.10970-net10-rc.2</XamarinIOSWorkloadManifestVersion>
149+
<XamarinMacCatalystWorkloadManifestVersion>26.0.10970-net10-rc.2</XamarinMacCatalystWorkloadManifestVersion>
150+
<XamarinMacOSWorkloadManifestVersion>26.0.10970-net10-rc.2</XamarinMacOSWorkloadManifestVersion>
151+
<XamarinTvOSWorkloadManifestVersion>26.0.10970-net10-rc.2</XamarinTvOSWorkloadManifestVersion>
152152
</PropertyGroup>
153153
<PropertyGroup Label="Pinned dependency">
154154
<!-- This package is not being produced outside of the 2.0 branch of corefx and should not change. -->

‎global.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@
2121
}
2222
},
2323
"msbuild-sdks": {
24-
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25515.107",
25-
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25515.107",
24+
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25515.111",
25+
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25515.111",
2626
"Microsoft.Build.NoTargets": "3.7.0",
2727
"Microsoft.Build.Traversal": "3.4.0",
28-
"Microsoft.WixToolset.Sdk": "5.0.2-dotnet.2737382"
28+
"Microsoft.WixToolset.Sdk": "5.0.2-dotnet.2811440"
2929
}
3030
}

‎sdk.slnx‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,13 +49,17 @@
4949
<Project Path="src/BuiltInTools/DotNetWatchTasks/DotNetWatchTasks.csproj" />
5050
<Project Path="src/BuiltInTools/HotReloadAgent.Data/Microsoft.DotNet.HotReload.Agent.Data.Package.csproj" />
5151
<Project Path="src/BuiltInTools/HotReloadAgent.Data/Microsoft.DotNet.HotReload.Agent.Data.shproj" />
52+
<Project Path="src/BuiltInTools/HotReloadAgent.Host/Microsoft.DotNet.HotReload.Agent.Host.Package.csproj" />
53+
<Project Path="src/BuiltInTools/HotReloadAgent.Host/Microsoft.DotNet.HotReload.Agent.Host.shproj" />
5254
<Project Path="src/BuiltInTools/HotReloadAgent.PipeRpc/Microsoft.DotNet.HotReload.Agent.PipeRpc.Package.csproj" />
5355
<Project Path="src/BuiltInTools/HotReloadAgent.PipeRpc/Microsoft.DotNet.HotReload.Agent.PipeRpc.shproj" />
5456
<Project Path="src/BuiltInTools/HotReloadAgent.WebAssembly.Browser/Microsoft.DotNet.HotReload.WebAssembly.Browser.csproj" />
5557
<Project Path="src/BuiltInTools/HotReloadAgent/Microsoft.DotNet.HotReload.Agent.Package.csproj" />
5658
<Project Path="src/BuiltInTools/HotReloadAgent/Microsoft.DotNet.HotReload.Agent.shproj" />
5759
<Project Path="src/BuiltInTools/HotReloadClient/Microsoft.DotNet.HotReload.Client.Package.csproj" />
58-
<Project Path="src/BuiltInTools/HotReloadClient/Microsoft.DotNet.HotReload.Client.shproj" Id="a78ff92a-d715-4249-9e3d-40d9997a098f" />
60+
<Project Path="src/BuiltInTools/HotReloadClient/Microsoft.DotNet.HotReload.Client.shproj" />
61+
<Project Path="src/BuiltInTools/Web.Middleware/Microsoft.DotNet.HotReload.Web.Middleware.Package.csproj" />
62+
<Project Path="src/BuiltInTools/Web.Middleware/Microsoft.DotNet.HotReload.Web.Middleware.shproj" />
5963
</Folder>
6064
<Folder Name="/src/Cli/">
6165
<Project Path="src/Cli/dotnet/dotnet.csproj" />

‎src/BuiltInTools/BrowserRefresh/.editorconfig‎

Lines changed: 0 additions & 2 deletions
This file was deleted.

0 commit comments

Comments
 (0)