Skip to content

[main] Update dependencies from dotnet/runtime #32250

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nagilson merged 20 commits into from
May 9, 2023
Merged

[main] Update dependencies from dotnet/runtime #32250

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
040eac5
Update dependencies from https://github.com/dotnet/runtime build 2023…
dotnet-maestro[bot] May 4, 2023
d9d4b4c
Update dependencies from https://github.com/dotnet/runtime build 2023…
dotnet-maestro[bot] May 4, 2023
0b43db7
Update dependencies from https://github.com/dotnet/runtime build 2023…
dotnet-maestro[bot] May 5, 2023
f75cd8c
Update dependencies from https://github.com/dotnet/runtime build 2023…
dotnet-maestro[bot] May 5, 2023
ee760e7
Merge branch 'main' into darc-main-440caf43-059a-43fc-ba7d-83af25e8c08a
lewing May 5, 2023
c47c4df
Update dependencies from https://github.com/dotnet/runtime build 2023…
dotnet-maestro[bot] May 5, 2023
5249db0
Update dependencies from https://github.com/dotnet/runtime build 2023…
dotnet-maestro[bot] May 6, 2023
f390eff
Update dependencies from https://github.com/dotnet/runtime build 2023…
dotnet-maestro[bot] May 6, 2023
ef101a7
Update dependencies from https://github.com/dotnet/runtime build 2023…
dotnet-maestro[bot] May 6, 2023
eb4f091
Update dependencies from https://github.com/dotnet/runtime build 2023…
dotnet-maestro[bot] May 6, 2023
3a2d57a
Update dependencies from https://github.com/dotnet/runtime build 2023…
dotnet-maestro[bot] May 6, 2023
e48a538
Update dependencies from https://github.com/dotnet/runtime build 2023…
dotnet-maestro[bot] May 6, 2023
b387b43
Update dependencies from https://github.com/dotnet/runtime build 2023…
dotnet-maestro[bot] May 8, 2023
350895d
Update dependencies from https://github.com/dotnet/runtime build 2023…
dotnet-maestro[bot] May 8, 2023
74c51bd
Update dependencies from https://github.com/dotnet/runtime build 2023…
dotnet-maestro[bot] May 8, 2023
8f17d2b
Update dependencies from https://github.com/dotnet/runtime build 2023…
dotnet-maestro[bot] May 8, 2023
e82f1c7
Update dependencies from https://github.com/dotnet/runtime build 2023…
dotnet-maestro[bot] May 8, 2023
c2d8990
Override ASP.NET framework reference
BrennanConroy May 8, 2023
8fbfcac
Merge branch 'main' into darc-main-440caf43-059a-43fc-ba7d-83af25e8c08a
BrennanConroy May 8, 2023
2fb4edb
merge by updating the manually added dependency to the props file
nagilson May 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions Directory.Build.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,4 +54,13 @@
RuntimeFrameworkVersion="$(MicrosoftNETCoreAppRuntimePackageVersion)" />
</ItemGroup>

<ItemGroup Condition="$(MicrosoftAspNetCoreAppRefPackageVersion.StartsWith('$(_TargetFrameworkVersionWithoutV)'))">
<KnownFrameworkReference Update="Microsoft.AspNetCore.App">
<LatestRuntimeFrameworkVersion>$(MicrosoftAspNetCoreAppRefPackageVersion)</LatestRuntimeFrameworkVersion>
<RuntimePackRuntimeIdentifiers>${SupportedRuntimeIdentifiers}</RuntimePackRuntimeIdentifiers>
<TargetingPackVersion>$(MicrosoftAspNetCoreAppRefPackageVersion)</TargetingPackVersion>
<DefaultRuntimeFrameworkVersion>$(MicrosoftAspNetCoreAppRefPackageVersion)</DefaultRuntimeFrameworkVersion>
</KnownFrameworkReference>
</ItemGroup>

</Project>
60 changes: 30 additions & 30 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,42 +6,42 @@
<Sha>8b1a15627cdd27052504ea55856ca3d4b7f86888</Sha>
<SourceBuild RepoName="templating" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.0-preview.5.23253.15">
<Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.0-preview.5.23258.4">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>b4e14b4b464ad1644d1f01f79e8c614db07d2a7a</Sha>
<Sha>b1329633572d124fe43f7d58bb113f59f886e80b</Sha>
</Dependency>
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.8.0" Version="8.0.0-preview.5.23253.15">
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.8.0" Version="8.0.0-preview.5.23258.4">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>b4e14b4b464ad1644d1f01f79e8c614db07d2a7a</Sha>
<Sha>b1329633572d124fe43f7d58bb113f59f886e80b</Sha>
<SourceBuild RepoName="runtime" ManagedOnly="false" />
</Dependency>
<Dependency Name="VS.Redist.Common.NetCore.TargetingPack.x64.8.0" Version="8.0.0-preview.5.23253.15">
<Dependency Name="VS.Redist.Common.NetCore.TargetingPack.x64.8.0" Version="8.0.0-preview.5.23258.4">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>b4e14b4b464ad1644d1f01f79e8c614db07d2a7a</Sha>
<Sha>b1329633572d124fe43f7d58bb113f59f886e80b</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="8.0.0-preview.5.23253.15">
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="8.0.0-preview.5.23258.4">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>b4e14b4b464ad1644d1f01f79e8c614db07d2a7a</Sha>
<Sha>b1329633572d124fe43f7d58bb113f59f886e80b</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="8.0.0-preview.5.23253.15">
<Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="8.0.0-preview.5.23258.4">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>b4e14b4b464ad1644d1f01f79e8c614db07d2a7a</Sha>
<Sha>b1329633572d124fe43f7d58bb113f59f886e80b</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.Platforms" Version="8.0.0-preview.5.23253.15">
<Dependency Name="Microsoft.NETCore.Platforms" Version="8.0.0-preview.5.23258.4">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>b4e14b4b464ad1644d1f01f79e8c614db07d2a7a</Sha>
<Sha>b1329633572d124fe43f7d58bb113f59f886e80b</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.HostModel" Version="8.0.0-preview.5.23253.15">
<Dependency Name="Microsoft.NET.HostModel" Version="8.0.0-preview.5.23258.4">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>b4e14b4b464ad1644d1f01f79e8c614db07d2a7a</Sha>
<Sha>b1329633572d124fe43f7d58bb113f59f886e80b</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="8.0.0-preview.5.23253.15">
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="8.0.0-preview.5.23258.4">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>b4e14b4b464ad1644d1f01f79e8c614db07d2a7a</Sha>
<Sha>b1329633572d124fe43f7d58bb113f59f886e80b</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.DotNetHostResolver" Version="8.0.0-preview.5.23253.15">
<Dependency Name="Microsoft.NETCore.DotNetHostResolver" Version="8.0.0-preview.5.23258.4">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>b4e14b4b464ad1644d1f01f79e8c614db07d2a7a</Sha>
<Sha>b1329633572d124fe43f7d58bb113f59f886e80b</Sha>
</Dependency>
<Dependency Name="Microsoft.Build" Version="17.7.0-preview-23255-04">
<Uri>https://github.com/dotnet/msbuild</Uri>
Expand Down Expand Up @@ -116,29 +116,29 @@
<Sha>8f4e13c6e129ea5e5e4c1a1fc072e71e7b2ad277</Sha>
<SourceBuild RepoName="vstest" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="8.0.0-preview.5.23253.15">
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="8.0.0-preview.5.23258.4">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>b4e14b4b464ad1644d1f01f79e8c614db07d2a7a</Sha>
<Sha>b1329633572d124fe43f7d58bb113f59f886e80b</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.ILLink.Analyzers" Version="8.0.100-1.23067.1">
<Uri>https://github.com/dotnet/linker</Uri>
<Sha>c790896f128957acd2999208f44f09ae1e826c8c</Sha>
</Dependency>
<Dependency Name="System.CodeDom" Version="8.0.0-preview.5.23253.15">
<Dependency Name="System.CodeDom" Version="8.0.0-preview.5.23258.4">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>b4e14b4b464ad1644d1f01f79e8c614db07d2a7a</Sha>
<Sha>b1329633572d124fe43f7d58bb113f59f886e80b</Sha>
</Dependency>
<Dependency Name="System.Security.Cryptography.ProtectedData" Version="8.0.0-preview.5.23253.15">
<Dependency Name="System.Security.Cryptography.ProtectedData" Version="8.0.0-preview.5.23258.4">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>b4e14b4b464ad1644d1f01f79e8c614db07d2a7a</Sha>
<Sha>b1329633572d124fe43f7d58bb113f59f886e80b</Sha>
</Dependency>
<Dependency Name="System.Text.Encoding.CodePages" Version="8.0.0-preview.5.23253.15">
<Dependency Name="System.Text.Encoding.CodePages" Version="8.0.0-preview.5.23258.4">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>b4e14b4b464ad1644d1f01f79e8c614db07d2a7a</Sha>
<Sha>b1329633572d124fe43f7d58bb113f59f886e80b</Sha>
</Dependency>
<Dependency Name="System.Resources.Extensions" Version="8.0.0-preview.5.23253.15">
<Dependency Name="System.Resources.Extensions" Version="8.0.0-preview.5.23258.4">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>b4e14b4b464ad1644d1f01f79e8c614db07d2a7a</Sha>
<Sha>b1329633572d124fe43f7d58bb113f59f886e80b</Sha>
</Dependency>
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="8.0.0-preview.5.23258.1">
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
Expand Down Expand Up @@ -331,9 +331,9 @@
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>5dff25b814b90abb85c847ed274cf4afb2c1b276</Sha>
</Dependency>
<Dependency Name="System.Reflection.MetadataLoadContext" Version="8.0.0-preview.5.23253.15">
<Dependency Name="System.Reflection.MetadataLoadContext" Version="8.0.0-preview.5.23258.4">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>b4e14b4b464ad1644d1f01f79e8c614db07d2a7a</Sha>
<Sha>b1329633572d124fe43f7d58bb113f59f886e80b</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.23253.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
<Uri>https://github.com/dotnet/xliff-tasks</Uri>
Expand Down
25 changes: 13 additions & 12 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,30 +31,30 @@
<SystemReflectionMetadataVersion>7.0.0</SystemReflectionMetadataVersion>
<MicrosoftDotNetSignToolVersion>8.0.0-beta.23255.2</MicrosoftDotNetSignToolVersion>
<MicrosoftWebXdtPackageVersion>7.0.0-preview.22423.2</MicrosoftWebXdtPackageVersion>
<SystemSecurityCryptographyProtectedDataPackageVersion>8.0.0-preview.5.23253.15</SystemSecurityCryptographyProtectedDataPackageVersion>
<SystemSecurityCryptographyProtectedDataPackageVersion>8.0.0-preview.5.23258.4</SystemSecurityCryptographyProtectedDataPackageVersion>
<SystemCollectionsSpecializedPackageVersion>4.3.0</SystemCollectionsSpecializedPackageVersion>
<SystemXmlXmlDocumentPackageVersion>4.3.0</SystemXmlXmlDocumentPackageVersion>
<WebDeploymentPackageVersion>4.0.5</WebDeploymentPackageVersion>
<SystemTextJsonVersion>7.0.2</SystemTextJsonVersion>
<SystemReflectionMetadataLoadContextVersion>8.0.0-preview.5.23253.15</SystemReflectionMetadataLoadContextVersion>
<SystemReflectionMetadataLoadContextVersion>8.0.0-preview.5.23258.4</SystemReflectionMetadataLoadContextVersion>
<SystemManagementPackageVersion>4.6.0</SystemManagementPackageVersion>
<SystemCommandLineVersion>2.0.0-beta4.22564.1</SystemCommandLineVersion>
<MicrosoftDeploymentDotNetReleasesVersion>1.0.0-preview.6.23206.1</MicrosoftDeploymentDotNetReleasesVersion>
<MicrosoftVisualStudioSetupConfigurationInteropVersion>3.2.2146</MicrosoftVisualStudioSetupConfigurationInteropVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/runtime -->
<MicrosoftNETCoreAppRefPackageVersion>8.0.0-preview.5.23253.15</MicrosoftNETCoreAppRefPackageVersion>
<VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>8.0.0-preview.5.23253.15</VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>8.0.0-preview.5.23253.15</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>8.0.0-preview.5.23258.4</MicrosoftNETCoreAppRefPackageVersion>
<VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>8.0.0-preview.5.23258.4</VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>8.0.0-preview.5.23258.4</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
<MicrosoftNETCoreAppRuntimePackageVersion>$(MicrosoftNETCoreAppRuntimewinx64PackageVersion)</MicrosoftNETCoreAppRuntimePackageVersion>
<MicrosoftExtensionsDependencyModelPackageVersion>8.0.0-preview.5.23253.15</MicrosoftExtensionsDependencyModelPackageVersion>
<MicrosoftNETCoreDotNetHostResolverPackageVersion>8.0.0-preview.5.23253.15</MicrosoftNETCoreDotNetHostResolverPackageVersion>
<MicrosoftNETHostModelVersion>8.0.0-preview.5.23253.15</MicrosoftNETHostModelVersion>
<MicrosoftExtensionsDependencyModelPackageVersion>8.0.0-preview.5.23258.4</MicrosoftExtensionsDependencyModelPackageVersion>
<MicrosoftNETCoreDotNetHostResolverPackageVersion>8.0.0-preview.5.23258.4</MicrosoftNETCoreDotNetHostResolverPackageVersion>
<MicrosoftNETHostModelVersion>8.0.0-preview.5.23258.4</MicrosoftNETHostModelVersion>
<MicrosoftExtensionsFileSystemGlobbingPackageVersion>6.0.0</MicrosoftExtensionsFileSystemGlobbingPackageVersion>
<MicrosoftExtensionsDependencyModelVersion>$(MicrosoftExtensionsDependencyModelPackageVersion)</MicrosoftExtensionsDependencyModelVersion>
<MicrosoftExtensionsLoggingConsoleVersion>6.0.0</MicrosoftExtensionsLoggingConsoleVersion>
<MicrosoftNETILLinkTasksPackageVersion>8.0.0-preview.5.23253.15</MicrosoftNETILLinkTasksPackageVersion>
<MicrosoftNETILLinkTasksPackageVersion>8.0.0-preview.5.23258.4</MicrosoftNETILLinkTasksPackageVersion>
<SystemServiceProcessServiceControllerVersion>7.0.0</SystemServiceProcessServiceControllerVersion>
</PropertyGroup>
<PropertyGroup>
Expand Down Expand Up @@ -82,9 +82,9 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/runtime -->
<SystemCodeDomPackageVersion>8.0.0-preview.5.23253.15</SystemCodeDomPackageVersion>
<SystemTextEncodingCodePagesPackageVersion>8.0.0-preview.5.23253.15</SystemTextEncodingCodePagesPackageVersion>
<SystemResourcesExtensionsPackageVersion>8.0.0-preview.5.23253.15</SystemResourcesExtensionsPackageVersion>
<SystemCodeDomPackageVersion>8.0.0-preview.5.23258.4</SystemCodeDomPackageVersion>
<SystemTextEncodingCodePagesPackageVersion>8.0.0-preview.5.23258.4</SystemTextEncodingCodePagesPackageVersion>
<SystemResourcesExtensionsPackageVersion>8.0.0-preview.5.23258.4</SystemResourcesExtensionsPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/format -->
Expand Down Expand Up @@ -144,6 +144,7 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/aspnet/AspNetCore -->
<MicrosoftAspNetCoreAppRefPackageVersion>8.0.0-preview.5.23258.12</MicrosoftAspNetCoreAppRefPackageVersion>
<MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>8.0.0-preview.5.23258.12</MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>
<MicrosoftAspNetCoreComponentsSdkAnalyzersPackageVersion>8.0.0-preview.5.23258.12</MicrosoftAspNetCoreComponentsSdkAnalyzersPackageVersion>
<MicrosoftAspNetCoreMvcAnalyzersPackageVersion>8.0.0-preview.5.23258.12</MicrosoftAspNetCoreMvcAnalyzersPackageVersion>
Expand Down
3 changes: 3 additions & 0 deletions global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@
"runtimes": {
"dotnet": [
"$(VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion)"
],
"aspnetcore": [
"$(MicrosoftAspNetCoreAppRefPackageVersion)"
]
},
"vs-opt": {
Expand Down