NotificationsYou must be signed in to change notification settings
Fork3.3k
Star14.5k

Commitcca4eb8

authored

Merge pull request#35083

Merging internal commits for release/9.0

2 parents7b704c9 +3c5b201 commitcca4eb8Copy full SHA for cca4eb8

File tree

3 files changed

+36

-35

lines changed

3 files changed

+36

-35

lines changed

`‎NuGet.config‎`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`<clear />`
`5`	`5`	`<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->`
`6`	`6`	`<!-- Begin: Package sources from dotnet-runtime-->`
`7`		`- <addkey="darc-pub-dotnet-runtime-d398172"value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-d3981726/nuget/v3/index.json" />`
	`7`	`+ <addkey="darc-int-dotnet-runtime-9d5a6a9"value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-9d5a6a9a/nuget/v3/index.json" />`
`8`	`8`	`<!-- End: Package sources from dotnet-runtime-->`
`9`	`9`	`<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->`
`10`	`10`	`<addkey="dotnet-eng"value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />`
`@@ -21,6 +21,7 @@`
`21`	`21`	`<clear />`
`22`	`22`	`<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->`
`23`	`23`	`<!-- Begin: Package sources from dotnet-runtime-->`
	`24`	`+ <addkey="darc-int-dotnet-runtime-9d5a6a9"value="true" />`
`24`	`25`	`<!-- End: Package sources from dotnet-runtime-->`
`25`	`26`	`<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->`
`26`	`27`	`</disabledPackageSources>`

`‎eng/Version.Details.xml‎`

Lines changed: 32 additions & 32 deletions

Original file line number	Diff line number	Diff line change
`@@ -2,68 +2,68 @@`
`2`	`2`	`<Dependencies>`
`3`	`3`	`<ProductDependencies>`
`4`	`4`	`<DependencyName="Microsoft.Extensions.Caching.Memory"Version="9.0.0">`
`5`		`- <Uri>https://github.com/dotnet/runtime</Uri>`
`6`		`- <Sha>d3981726bc8b0e179db50301daf9f22d42393096</Sha>`
	`5`	`+ <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>`
	`6`	`+ <Sha>9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3</Sha>`
`7`	`7`	`</Dependency>`
`8`	`8`	`<DependencyName="Microsoft.Extensions.Configuration.EnvironmentVariables"Version="9.0.0">`
`9`		`- <Uri>https://github.com/dotnet/runtime</Uri>`
`10`		`- <Sha>d3981726bc8b0e179db50301daf9f22d42393096</Sha>`
	`9`	`+ <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>`
	`10`	`+ <Sha>9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3</Sha>`
`11`	`11`	`</Dependency>`
`12`	`12`	`<DependencyName="Microsoft.Extensions.Configuration.Abstractions"Version="9.0.0">`
`13`		`- <Uri>https://github.com/dotnet/runtime</Uri>`
`14`		`- <Sha>d3981726bc8b0e179db50301daf9f22d42393096</Sha>`
	`13`	`+ <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>`
	`14`	`+ <Sha>9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3</Sha>`
`15`	`15`	`</Dependency>`
`16`	`16`	`<DependencyName="Microsoft.Extensions.Configuration.Json"Version="9.0.0">`
`17`		`- <Uri>https://github.com/dotnet/runtime</Uri>`
`18`		`- <Sha>d3981726bc8b0e179db50301daf9f22d42393096</Sha>`
	`17`	`+ <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>`
	`18`	`+ <Sha>9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3</Sha>`
`19`	`19`	`</Dependency>`
`20`	`20`	`<DependencyName="Microsoft.Extensions.Configuration"Version="9.0.0">`
`21`		`- <Uri>https://github.com/dotnet/runtime</Uri>`
`22`		`- <Sha>d3981726bc8b0e179db50301daf9f22d42393096</Sha>`
	`21`	`+ <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>`
	`22`	`+ <Sha>9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3</Sha>`
`23`	`23`	`</Dependency>`
`24`	`24`	`<DependencyName="Microsoft.Extensions.DependencyInjection"Version="9.0.0">`
`25`		`- <Uri>https://github.com/dotnet/runtime</Uri>`
`26`		`- <Sha>d3981726bc8b0e179db50301daf9f22d42393096</Sha>`
	`25`	`+ <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>`
	`26`	`+ <Sha>9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3</Sha>`
`27`	`27`	`</Dependency>`
`28`	`28`	`<DependencyName="Microsoft.Extensions.DependencyModel"Version="9.0.0">`
`29`		`- <Uri>https://github.com/dotnet/runtime</Uri>`
`30`		`- <Sha>d3981726bc8b0e179db50301daf9f22d42393096</Sha>`
	`29`	`+ <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>`
	`30`	`+ <Sha>9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3</Sha>`
`31`	`31`	`</Dependency>`
`32`		`- <DependencyName="Microsoft.Extensions.HostFactoryResolver.Sources"Version="9.0.0-rtm.24516.10">`
`33`		`- <Uri>https://github.com/dotnet/runtime</Uri>`
`34`		`- <Sha>d3981726bc8b0e179db50301daf9f22d42393096</Sha>`
	`32`	`+ <DependencyName="Microsoft.Extensions.HostFactoryResolver.Sources"Version="9.0.0-rtm.24528.9">`
	`33`	`+ <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>`
	`34`	`+ <Sha>9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3</Sha>`
`35`	`35`	`</Dependency>`
`36`	`36`	`<DependencyName="Microsoft.Extensions.Logging"Version="9.0.0">`
`37`		`- <Uri>https://github.com/dotnet/runtime</Uri>`
`38`		`- <Sha>d3981726bc8b0e179db50301daf9f22d42393096</Sha>`
	`37`	`+ <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>`
	`38`	`+ <Sha>9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3</Sha>`
`39`	`39`	`</Dependency>`
`40`	`40`	`<DependencyName="Microsoft.NETCore.App.Ref"Version="9.0.0">`
`41`		`- <Uri>https://github.com/dotnet/runtime</Uri>`
`42`		`- <Sha>d3981726bc8b0e179db50301daf9f22d42393096</Sha>`
	`41`	`+ <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>`
	`42`	`+ <Sha>9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3</Sha>`
`43`	`43`	`</Dependency>`
`44`		`- <DependencyName="Microsoft.NETCore.BrowserDebugHost.Transport"Version="9.0.0-rtm.24516.10">`
`45`		`- <Uri>https://github.com/dotnet/runtime</Uri>`
`46`		`- <Sha>d3981726bc8b0e179db50301daf9f22d42393096</Sha>`
	`44`	`+ <DependencyName="Microsoft.NETCore.BrowserDebugHost.Transport"Version="9.0.0-rtm.24528.9">`
	`45`	`+ <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>`
	`46`	`+ <Sha>9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3</Sha>`
`47`	`47`	`</Dependency>`
`48`	`48`	`<!--`
`49`	`49`	`Win-x64 is used here because we have picked an arbitrary runtime identifier to flow the version of the latest NETCore.App runtime.`
`50`	`50`	`All Runtime.$rid packages should have the same version.`
`51`	`51`	`-->`
`52`	`52`	`<DependencyName="Microsoft.NETCore.App.Runtime.win-x64"Version="9.0.0">`
`53`		`- <Uri>https://github.com/dotnet/runtime</Uri>`
`54`		`- <Sha>d3981726bc8b0e179db50301daf9f22d42393096</Sha>`
	`53`	`+ <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>`
	`54`	`+ <Sha>9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3</Sha>`
`55`	`55`	`</Dependency>`
`56`	`56`	`<DependencyName="System.Text.Json"Version="9.0.0">`
`57`		`- <Uri>https://github.com/dotnet/runtime</Uri>`
`58`		`- <Sha>d3981726bc8b0e179db50301daf9f22d42393096</Sha>`
	`57`	`+ <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>`
	`58`	`+ <Sha>9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3</Sha>`
`59`	`59`	`</Dependency>`
`60`	`60`	`<DependencyName="System.Text.Encodings.Web"Version="9.0.0">`
`61`		`- <Uri>https://github.com/dotnet/runtime</Uri>`
`62`		`- <Sha>d3981726bc8b0e179db50301daf9f22d42393096</Sha>`
	`61`	`+ <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>`
	`62`	`+ <Sha>9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3</Sha>`
`63`	`63`	`</Dependency>`
`64`	`64`	`<DependencyName="System.Formats.Asn1"Version="9.0.0">`
`65`		`- <Uri>https://github.com/dotnet/runtime</Uri>`
`66`		`- <Sha>d3981726bc8b0e179db50301daf9f22d42393096</Sha>`
	`65`	`+ <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>`
	`66`	`+ <Sha>9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3</Sha>`
`67`	`67`	`</Dependency>`
`68`	`68`	`</ProductDependencies>`
`69`	`69`	`<ToolsetDependencies>`

`‎eng/Versions.props‎`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -24,11 +24,11 @@`
`24`	`24`	`<MicrosoftExtensionsConfigurationJsonVersion>9.0.0</MicrosoftExtensionsConfigurationJsonVersion>`
`25`	`25`	`<MicrosoftExtensionsDependencyInjectionVersion>9.0.0</MicrosoftExtensionsDependencyInjectionVersion>`
`26`	`26`	`<MicrosoftExtensionsDependencyModelVersion>9.0.0</MicrosoftExtensionsDependencyModelVersion>`
`27`		`- <MicrosoftExtensionsHostFactoryResolverSourcesVersion>9.0.0-rtm.24516.10</MicrosoftExtensionsHostFactoryResolverSourcesVersion>`
	`27`	`+ <MicrosoftExtensionsHostFactoryResolverSourcesVersion>9.0.0-rtm.24528.9</MicrosoftExtensionsHostFactoryResolverSourcesVersion>`
`28`	`28`	`<MicrosoftExtensionsLoggingVersion>9.0.0</MicrosoftExtensionsLoggingVersion>`
`29`	`29`	`<MicrosoftNETCoreAppRefVersion>9.0.0</MicrosoftNETCoreAppRefVersion>`
`30`	`30`	`<MicrosoftNETCoreAppRuntimewinx64Version>9.0.0</MicrosoftNETCoreAppRuntimewinx64Version>`
`31`		`- <MicrosoftNETCoreBrowserDebugHostTransportVersion>9.0.0-rtm.24516.10</MicrosoftNETCoreBrowserDebugHostTransportVersion>`
	`31`	`+ <MicrosoftNETCoreBrowserDebugHostTransportVersion>9.0.0-rtm.24528.9</MicrosoftNETCoreBrowserDebugHostTransportVersion>`
`32`	`32`	`<SystemTextEncodingsWebVersion>9.0.0</SystemTextEncodingsWebVersion>`
`33`	`33`	`<SystemTextJsonVersion>9.0.0</SystemTextJsonVersion>`
`34`	`34`	`<SystemFormatsAsn1Version>9.0.0</SystemFormatsAsn1Version>`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commitcca4eb8

File tree

3 files changed

3 files changed

`‎NuGet.config‎`

`‎eng/Version.Details.xml‎`

`‎eng/Versions.props‎`

0 commit comments