Skip to content

Commit 1edbcd0

Browse files
authored
Merge branch 'main' into multi-agent-ci
2 parents 3c813b0 + 63dd8ca commit 1edbcd0

File tree

4 files changed

+7
-53
lines changed

4 files changed

+7
-53
lines changed

eng/DotNetBuild.props

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,13 @@
11
<!-- When altering this file, include @dotnet/product-construction as a reviewer. -->
22
<Project>
33

4+
<!-- TODO: Remove this file when fsharp upgrades to Arcade 10 -->
45
<PropertyGroup>
56
<GitHubRepositoryName>fsharp</GitHubRepositoryName>
67
<SourceBuildManagedOnly>true</SourceBuildManagedOnly>
8+
<ReportPrebuiltUsage Condition="'$(DotNetBuildSourceOnly)' == 'true'">$(DotNetBuildOrchestrator)</ReportPrebuiltUsage>
9+
<SetUpSourceBuildIntermediateNupkgCache>false</SetUpSourceBuildIntermediateNupkgCache>
10+
<CreateIntermediatePackage>false</CreateIntermediatePackage>
711
</PropertyGroup>
812

913
<!--

eng/SourceBuildPrebuiltBaseline.xml

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

eng/Version.Details.xml

Lines changed: 2 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Dependencies>
33
<ProductDependencies>
4-
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="9.0.0-alpha.1.25223.3">
5-
<Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
6-
<Sha>19eb5ea4e5f9c4e5256843a92805c8c9e942207d</Sha>
7-
<SourceBuild RepoName="source-build-reference-packages" ManagedOnly="true" />
8-
</Dependency>
9-
<!-- Intermediate is necessary for source build. -->
10-
<Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.13.25-preview-25214-09">
11-
<Uri>https://github.com/dotnet/msbuild</Uri>
12-
<Sha>7ad4e1c76585d0ed6e438da2d4f9394326934399</Sha>
13-
<SourceBuild RepoName="msbuild" ManagedOnly="true" />
14-
</Dependency>
154
<Dependency Name="Microsoft.Build" Version="17.13.25">
165
<Uri>https://github.com/dotnet/msbuild</Uri>
176
<Sha>7ad4e1c76585d0ed6e438da2d4f9394326934399</Sha>
@@ -42,15 +31,9 @@
4231
</Dependency>
4332
</ProductDependencies>
4433
<ToolsetDependencies>
45-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.25225.6">
46-
<Uri>https://github.com/dotnet/arcade</Uri>
47-
<Sha>bfbc858ba868b60fffaf7b2150f1d2165b01e786</Sha>
48-
</Dependency>
49-
<!-- Intermediate is necessary for source build. -->
50-
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.25225.6">
34+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.25255.3">
5135
<Uri>https://github.com/dotnet/arcade</Uri>
52-
<Sha>bfbc858ba868b60fffaf7b2150f1d2165b01e786</Sha>
53-
<SourceBuild RepoName="arcade" ManagedOnly="true" />
36+
<Sha>dba26274ff5a0906a1880443fc3c0466d1a298ae</Sha>
5437
</Dependency>
5538
<Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.24462.2">
5639
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>

global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"perl": "5.38.2.2"
1818
},
1919
"msbuild-sdks": {
20-
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25225.6",
20+
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25255.3",
2121
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23255.2"
2222
}
2323
}

0 commit comments

Comments
 (0)