Skip to content

Commit 9b949ee

Browse files
[main] Source code updates from dotnet/dotnet (#1460)
[main] Source code updates from dotnet/dotnet - Remove properties that now live in Version.Details.props - Import Version.Details.props
1 parent 6afcad6 commit 9b949ee

File tree

4 files changed

+35
-14
lines changed

4 files changed

+35
-14
lines changed

eng/Version.Details.props

Lines changed: 25 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,25 @@
1-
<!-- will get filled in the next backflow -->
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<!--
3+
This file is auto-generated by the Maestro dependency flow system.
4+
Do not edit it manually, as it will get overwritten by automation.
5+
This file should be imported by eng/Versions.props
6+
-->
7+
<Project>
8+
<PropertyGroup>
9+
<!-- dotnet/dotnet dependencies -->
10+
<MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.25401.103</MicrosoftDotNetArcadeSdkPackageVersion>
11+
<SystemCommandLinePackageVersion>2.0.0-rc.1.25401.103</SystemCommandLinePackageVersion>
12+
<!-- dotnet/msbuild dependencies -->
13+
<MicrosoftBuildPackageVersion>17.11.31</MicrosoftBuildPackageVersion>
14+
<MicrosoftBuildTasksCorePackageVersion>17.11.31</MicrosoftBuildTasksCorePackageVersion>
15+
</PropertyGroup>
16+
<!--Property group for alternate package version names-->
17+
<PropertyGroup>
18+
<!-- dotnet/dotnet dependencies -->
19+
<MicrosoftDotNetArcadeSdkVersion>$(MicrosoftDotNetArcadeSdkPackageVersion)</MicrosoftDotNetArcadeSdkVersion>
20+
<SystemCommandLineVersion>$(SystemCommandLinePackageVersion)</SystemCommandLineVersion>
21+
<!-- dotnet/msbuild dependencies -->
22+
<MicrosoftBuildVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildVersion>
23+
<MicrosoftBuildTasksCoreVersion>$(MicrosoftBuildTasksCorePackageVersion)</MicrosoftBuildTasksCoreVersion>
24+
</PropertyGroup>
25+
</Project>

eng/Version.Details.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Dependencies>
3-
<Source Uri="https://github.com/dotnet/dotnet" Mapping="sourcelink" Sha="6a953e76162f3f079405f80e28664fa51b136740" BarId="276981" />
3+
<Source Uri="https://github.com/dotnet/dotnet" Mapping="sourcelink" Sha="8b29a1682219da555ee27e4fdda55dc3884b316f" BarId="277635" />
44
<ProductDependencies>
5-
<Dependency Name="System.CommandLine" Version="2.0.0-rc.1.25377.103">
5+
<Dependency Name="System.CommandLine" Version="2.0.0-rc.1.25401.103">
66
<Uri>https://github.com/dotnet/dotnet</Uri>
7-
<Sha>6a953e76162f3f079405f80e28664fa51b136740</Sha>
7+
<Sha>8b29a1682219da555ee27e4fdda55dc3884b316f</Sha>
88
</Dependency>
99
</ProductDependencies>
1010
<ToolsetDependencies>
11-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25377.103">
11+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25401.103">
1212
<Uri>https://github.com/dotnet/dotnet</Uri>
13-
<Sha>6a953e76162f3f079405f80e28664fa51b136740</Sha>
13+
<Sha>8b29a1682219da555ee27e4fdda55dc3884b316f</Sha>
1414
</Dependency>
1515
<!-- Dependencies required for source build to lift to the previously-source-built version. -->
1616
<Dependency Name="Microsoft.Build" Version="17.11.31">

eng/Versions.props

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
<Project>
2+
<Import Project="Version.Details.props" Condition="Exists('Version.Details.props')" />
3+
24
<PropertyGroup>
35
<!-- This repo version -->
46
<VersionPrefix>10.0.0</VersionPrefix>
@@ -9,11 +11,6 @@
911
<FlagNetStandard1XDependencies>true</FlagNetStandard1XDependencies>
1012
</PropertyGroup>
1113
<PropertyGroup>
12-
<!-- commandline -->
13-
<SystemCommandLineVersion>2.0.0-rc.1.25377.103</SystemCommandLineVersion>
14-
<!-- msbuild -->
15-
<MicrosoftBuildVersion>17.11.31</MicrosoftBuildVersion>
16-
<MicrosoftBuildTasksCoreVersion>17.11.31</MicrosoftBuildTasksCoreVersion>
1714
<!-- nuget -->
1815
<NuGetVersioningVersion>6.12.1</NuGetVersioningVersion>
1916
<!-- runtime -->

global.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"sdk": {
3-
"version": "10.0.100-preview.7.25322.101",
3+
"version": "10.0.100-preview.7.25372.107",
44
"allowPrerelease": true,
55
"rollForward": "latestFeature",
66
"paths": [
@@ -10,10 +10,10 @@
1010
"errorMessage": "The required .NET SDK wasn't found. Please run ./eng/common/dotnet.cmd/sh to install it."
1111
},
1212
"tools": {
13-
"dotnet": "10.0.100-preview.7.25322.101"
13+
"dotnet": "10.0.100-preview.7.25372.107"
1414
},
1515
"msbuild-sdks": {
16-
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25377.103",
16+
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25401.103",
1717
"Microsoft.Build.NoTargets": "3.7.0"
1818
}
1919
}

0 commit comments

Comments
 (0)