Commitfcc5f29

authored

Merge pull request#9256 from dotnet/darc-release/10.0.1xx-a7413d2c-63dc-4568-9295-e94077606c41

[release/10.0.1xx] Source code updates from dotnet/dotnet

2 parentse98e11d +2b32759 commitfcc5f29Copy full SHA for fcc5f29

File tree

-9

lines changed

-9

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -7,8 +7,8 @@ This file should be imported by eng/Versions.props`
`7`	`7`	`<Project>`
`8`	`8`	`<PropertyGroup>`
`9`	`9`	`<!-- dotnet/dotnet dependencies-->`
`10`		`- <MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.25414.103</MicrosoftDotNetArcadeSdkPackageVersion>`
`11`		`- <SystemCommandLinePackageVersion>2.0.0-rc.1.25414.103</SystemCommandLinePackageVersion>`
	`10`	`+ <MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.25416.105</MicrosoftDotNetArcadeSdkPackageVersion>`
	`11`	`+ <SystemCommandLinePackageVersion>2.0.0-rc.2.25416.105</SystemCommandLinePackageVersion>`
`12`	`12`	`<!-- _git/dotnet-runtime dependencies-->`
`13`	`13`	`<MicrosoftBclAsyncInterfacesPackageVersion>9.0.3</MicrosoftBclAsyncInterfacesPackageVersion>`
`14`	`14`	`<MicrosoftExtensionsLoggingPackageVersion>9.0.3</MicrosoftExtensionsLoggingPackageVersion>`

Lines changed: 5 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,16 +1,16 @@`
`1`	`1`	`<?xml version="1.0" encoding="utf-8"?>`
`2`	`2`	`<Dependencies>`
`3`		`- <SourceUri="https://github.com/dotnet/dotnet"Mapping="templating"Sha="5088919af0e4a144ce5b294542f472bf668c9cc8"BarId="279336" />`
	`3`	`+ <SourceUri="https://github.com/dotnet/dotnet"Mapping="templating"Sha="a01724db6d16445177cb31c6f300d38b0af06290"BarId="279606" />`
`4`	`4`	`<ProductDependencies>`
`5`		`- <DependencyName="System.CommandLine"Version="2.0.0-rc.1.25414.103">`
	`5`	`+ <DependencyName="System.CommandLine"Version="2.0.0-rc.2.25416.105">`
`6`	`6`	`<Uri>https://github.com/dotnet/dotnet</Uri>`
`7`		`- <Sha>5088919af0e4a144ce5b294542f472bf668c9cc8</Sha>`
	`7`	`+ <Sha>a01724db6d16445177cb31c6f300d38b0af06290</Sha>`
`8`	`8`	`</Dependency>`
`9`	`9`	`</ProductDependencies>`
`10`	`10`	`<ToolsetDependencies>`
`11`		`- <DependencyName="Microsoft.DotNet.Arcade.Sdk"Version="10.0.0-beta.25414.103">`
	`11`	`+ <DependencyName="Microsoft.DotNet.Arcade.Sdk"Version="10.0.0-beta.25416.105">`
`12`	`12`	`<Uri>https://github.com/dotnet/dotnet</Uri>`
`13`		`- <Sha>5088919af0e4a144ce5b294542f472bf668c9cc8</Sha>`
	`13`	`+ <Sha>a01724db6d16445177cb31c6f300d38b0af06290</Sha>`
`14`	`14`	`</Dependency>`
`15`	`15`	`<!-- Dependencies required for source build. We'll still update manually-->`
`16`	`16`	`<DependencyName="System.Formats.Asn1"Version="9.0.3">`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`	`<PreReleaseVersionLabelCondition="'$(StabilizePackageVersion)' != 'true'">rc</PreReleaseVersionLabel>`
`10`	`10`	`<PreReleaseVersionLabelCondition="'$(StabilizePackageVersion)' == 'true' and $(VersionPrefix.EndsWith('00'))">rtm</PreReleaseVersionLabel>`
`11`	`11`	`<PreReleaseVersionLabelCondition="'$(StabilizePackageVersion)' == 'true' and !$(VersionPrefix.EndsWith('00'))">servicing</PreReleaseVersionLabel>`
`12`		`- <PreReleaseVersionIterationCondition="'$(StabilizePackageVersion)' != 'true'">1</PreReleaseVersionIteration>`
	`12`	`+ <PreReleaseVersionIterationCondition="'$(StabilizePackageVersion)' != 'true'">2</PreReleaseVersionIteration>`
`13`	`13`	`<UsingToolXliff>true</UsingToolXliff>`
`14`	`14`	`<FlagNetStandard1XDependencies>true</FlagNetStandard1XDependencies>`
`15`	`15`	`</PropertyGroup>`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,6 @@`
`13`	`13`	`"dotnet":"10.0.100-rc.1.25411.109"`
`14`	`14`	`},`
`15`	`15`	`"msbuild-sdks": {`
`16`		`-"Microsoft.DotNet.Arcade.Sdk":"10.0.0-beta.25414.103"`
	`16`	`+"Microsoft.DotNet.Arcade.Sdk":"10.0.0-beta.25416.105"`
`17`	`17`	`}`
`18`	`18`	`}`

Comments

(0)