Skip to content

Commit 088cfd7

Browse files
authored
Merge branch 'release/10.0.1xx' into merge/release/9.0.3xx-to-release/10.0.1xx
2 parents 3717eec + 17d3f8b commit 088cfd7

File tree

7 files changed

+276
-281
lines changed

7 files changed

+276
-281
lines changed

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-79c85d9" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-dotnet-79c85d96/nuget/v3/index.json" />
7+
<add key="darc-pub-dotnet-dotnet-50d7970" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-dotnet-50d79701/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: 69 additions & 69 deletions
Large diffs are not rendered by default.

eng/Version.Details.xml

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

eng/Versions.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@
125125
</PropertyGroup>
126126
<PropertyGroup Label="Manually updated">
127127
<!-- Dependencies from https://github.com/microsoft/MSBuildLocator -->
128-
<MicrosoftBuildLocatorPackageVersion>1.8.1</MicrosoftBuildLocatorPackageVersion>
128+
<MicrosoftBuildLocatorPackageVersion>1.10.2</MicrosoftBuildLocatorPackageVersion>
129129
<MicrosoftCodeAnalysisCSharpAnalyzerPinnedVersionPackageVersion>4.0.1</MicrosoftCodeAnalysisCSharpAnalyzerPinnedVersionPackageVersion>
130130
</PropertyGroup>
131131
<!-- Get .NET Framework reference assemblies from NuGet packages -->

eng/dotnet-format/dotnet-format-integration.yml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -50,13 +50,6 @@ parameters:
5050
_branchName: "main"
5151
_sha: "1b2ff365399ab6736a9ea4c98ab1b60acda5d917"
5252
_useParentSdk: 0
53-
- Name: razor_tooling
54-
_repo: "https://github.com/dotnet/razor"
55-
_repoName: "dotnet/razor"
56-
_targetSolution: "Razor.sln"
57-
_branchName: "main"
58-
_sha: "ecb4b595e3322a18c240f50a763868540f51eaaa"
59-
_useParentSdk: 0
6053

6154
- name: timeoutInMinutes
6255
type: number

global.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"errorMessage": "The .NET SDK is not installed or is not configured correctly. Please run ./build to install the correct SDK version locally."
88
},
99
"tools": {
10-
"dotnet": "10.0.100-rc.1.25451.107",
10+
"dotnet": "10.0.100-rc.2.25502.107",
1111
"runtimes": {
1212
"dotnet": [
1313
"$(MicrosoftNETCorePlatformsPackageVersion)"
@@ -21,8 +21,8 @@
2121
}
2222
},
2323
"msbuild-sdks": {
24-
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25515.111",
25-
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25515.111",
24+
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25520.117",
25+
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25520.117",
2626
"Microsoft.Build.NoTargets": "3.7.0",
2727
"Microsoft.Build.Traversal": "3.4.0",
2828
"Microsoft.WixToolset.Sdk": "5.0.2-dotnet.2811440"

src/Layout/redist/targets/OverlaySdkOnLKG.targets

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@
3131
</ItemGroup>
3232

3333
<!-- Copy artifacts to the testhost folder. -->
34+
<!-- Using hard linking below will cause the SDK testing overlay to create changes in the installer layout.
35+
Needs review and fix. https://github.com/dotnet/sdk/issues/51112 -->
3436
<Copy DestinationFiles="@(InstallerOutputFile)"
3537
SourceFiles="@(InstallerOutputFile->Metadata('Source'))"
3638
SkipUnchangedFiles="true"

0 commit comments

Comments
 (0)