Skip to content

Merging internal commits for release/7.0 #49338

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
merged 18 commits into from
Jul 11, 2023
Merged

Merging internal commits for release/7.0 #49338

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
206d815
Merge in 'release/7.0' changes
dotnet-bot Jun 7, 2023
6507ac6
[internal/release/7.0] Update dependencies from dnceng/internal/dotne…
dotnet-bot Jun 7, 2023
1b84f49
[internal/release/7.0] Update dependencies from dnceng/internal/dotne…
dotnet-bot Jun 9, 2023
e5ea1ee
Merged PR 31116: [internal/release/7.0] Always return SignInResult.F…
Jun 12, 2023
54a4c22
[internal/release/7.0] Update dependencies from dnceng/internal/dotne…
dotnet-bot Jun 13, 2023
5d69e95
Merge in 'release/7.0' changes
dotnet-bot Jun 13, 2023
6612759
[internal/release/7.0] Update dependencies from dnceng/internal/dotne…
dotnet-bot Jun 14, 2023
ef5ffb5
[internal/release/7.0] Update dependencies from dnceng/internal/dotne…
dotnet-bot Jun 14, 2023
8003498
[internal/release/7.0] Update dependencies from dnceng/internal/dotne…
dotnet-bot Jun 16, 2023
db64321
Merged PR 31966: [internal/release/7.0] Merge from public
vseanreesermsft Jun 16, 2023
2dead36
Merge in 'release/7.0' changes
dotnet-bot Jun 19, 2023
52009a9
Merge in 'release/7.0' changes
dotnet-bot Jun 20, 2023
01ed6ed
[internal/release/7.0] Update dependencies from dnceng/internal/dotne…
dotnet-bot Jun 20, 2023
4102502
[internal/release/7.0] Update dependencies from dnceng/internal/dotne…
dotnet-bot Jun 20, 2023
8c6acc1
Merged PR 32093: [internal/release/7.0] Update dependencies from dnce…
dotnet-bot Jun 21, 2023
b506e2c
Merged PR 32117: Fix shas for July
mmitche Jun 21, 2023
d154af9
Merge commit 'b506e2cb7b6c0fe787305f8cfdee046b7b3f9a53' into internal…
vseanreesermsft Jul 11, 2023
8a8b4a2
Update baseline, SDK
wtgodbe Jul 11, 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
4 changes: 4 additions & 0 deletions NuGet.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,10 @@
<clear />
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
<!-- Begin: Package sources from dotnet-efcore -->
<add key="darc-int-dotnet-efcore-e00be01" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-efcore-e00be013/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-efcore -->
<!-- Begin: Package sources from dotnet-runtime -->
<add key="darc-int-dotnet-runtime-8e9a17b" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-8e9a17b2/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-runtime -->
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
Expand All @@ -24,8 +26,10 @@
<clear />
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
<!-- Begin: Package sources from dotnet-efcore -->
<add key="darc-int-dotnet-efcore-e00be01" value="true" />
<!-- End: Package sources from dotnet-efcore -->
<!-- Begin: Package sources from dotnet-runtime -->
<add key="darc-int-dotnet-runtime-8e9a17b" value="true" />
<!-- End: Package sources from dotnet-runtime -->
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
</disabledPackageSources>
Expand Down
420 changes: 210 additions & 210 deletions eng/Baseline.Designer.props
View file
Open in desktop

Large diffs are not rendered by default.

208 changes: 104 additions & 104 deletions eng/Baseline.xml
View file
Open in desktop

Large diffs are not rendered by default.

64 changes: 32 additions & 32 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,37 +9,37 @@
-->
<Dependencies>
<ProductDependencies>
<Dependency Name="dotnet-ef" Version="7.0.7">
<Dependency Name="dotnet-ef" Version="7.0.9">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
<Sha>81a09d5f0ca45f744ec8a4b8938f38780bb15a4c</Sha>
<Sha>e00be013488a9a56a0e29230be0fe10026dbb209</Sha>
</Dependency>
<Dependency Name="Microsoft.EntityFrameworkCore.InMemory" Version="7.0.7">
<Dependency Name="Microsoft.EntityFrameworkCore.InMemory" Version="7.0.9">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
<Sha>81a09d5f0ca45f744ec8a4b8938f38780bb15a4c</Sha>
<Sha>e00be013488a9a56a0e29230be0fe10026dbb209</Sha>
</Dependency>
<Dependency Name="Microsoft.EntityFrameworkCore.Relational" Version="7.0.7">
<Dependency Name="Microsoft.EntityFrameworkCore.Relational" Version="7.0.9">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
<Sha>81a09d5f0ca45f744ec8a4b8938f38780bb15a4c</Sha>
<Sha>e00be013488a9a56a0e29230be0fe10026dbb209</Sha>
</Dependency>
<Dependency Name="Microsoft.EntityFrameworkCore.Sqlite" Version="7.0.7">
<Dependency Name="Microsoft.EntityFrameworkCore.Sqlite" Version="7.0.9">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
<Sha>81a09d5f0ca45f744ec8a4b8938f38780bb15a4c</Sha>
<Sha>e00be013488a9a56a0e29230be0fe10026dbb209</Sha>
</Dependency>
<Dependency Name="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.7">
<Dependency Name="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.9">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
<Sha>81a09d5f0ca45f744ec8a4b8938f38780bb15a4c</Sha>
<Sha>e00be013488a9a56a0e29230be0fe10026dbb209</Sha>
</Dependency>
<Dependency Name="Microsoft.EntityFrameworkCore.Tools" Version="7.0.7">
<Dependency Name="Microsoft.EntityFrameworkCore.Tools" Version="7.0.9">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
<Sha>81a09d5f0ca45f744ec8a4b8938f38780bb15a4c</Sha>
<Sha>e00be013488a9a56a0e29230be0fe10026dbb209</Sha>
</Dependency>
<Dependency Name="Microsoft.EntityFrameworkCore" Version="7.0.7">
<Dependency Name="Microsoft.EntityFrameworkCore" Version="7.0.9">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
<Sha>81a09d5f0ca45f744ec8a4b8938f38780bb15a4c</Sha>
<Sha>e00be013488a9a56a0e29230be0fe10026dbb209</Sha>
</Dependency>
<Dependency Name="Microsoft.EntityFrameworkCore.Design" Version="7.0.7">
<Dependency Name="Microsoft.EntityFrameworkCore.Design" Version="7.0.9">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
<Sha>81a09d5f0ca45f744ec8a4b8938f38780bb15a4c</Sha>
<Sha>e00be013488a9a56a0e29230be0fe10026dbb209</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Caching.Abstractions" Version="7.0.0">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
Expand Down Expand Up @@ -177,9 +177,9 @@
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>d099f075e45d2aa6007a22b71b45a08758559f80</Sha>
</Dependency>
<Dependency Name="Microsoft.Internal.Runtime.AspNetCore.Transport" Version="7.0.7-servicing.23274.4">
<Dependency Name="Microsoft.Internal.Runtime.AspNetCore.Transport" Version="7.0.9-servicing.23320.18">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>5b20af47d99620150c53eaf5db8636fdf730b126</Sha>
<Sha>8e9a17b2216f51a5788f8b1c467a4cf3b769e7d7</Sha>
</Dependency>
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-externals" Version="7.0.0-alpha.1.22505.1">
<Uri>https://github.com/dotnet/source-build-externals</Uri>
Expand Down Expand Up @@ -262,33 +262,33 @@
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>d099f075e45d2aa6007a22b71b45a08758559f80</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="7.0.7">
<Dependency Name="Microsoft.NETCore.App.Ref" Version="7.0.9">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>5b20af47d99620150c53eaf5db8636fdf730b126</Sha>
<Sha>8e9a17b2216f51a5788f8b1c467a4cf3b769e7d7</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Runtime.MonoAOTCompiler.Task" Version="7.0.7">
<Dependency Name="Microsoft.NET.Runtime.MonoAOTCompiler.Task" Version="7.0.9">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>5b20af47d99620150c53eaf5db8636fdf730b126</Sha>
<Sha>8e9a17b2216f51a5788f8b1c467a4cf3b769e7d7</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Runtime.WebAssembly.Sdk" Version="7.0.7">
<Dependency Name="Microsoft.NET.Runtime.WebAssembly.Sdk" Version="7.0.9">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>5b20af47d99620150c53eaf5db8636fdf730b126</Sha>
<Sha>8e9a17b2216f51a5788f8b1c467a4cf3b769e7d7</Sha>
</Dependency>
<!--
Win-x64 is used here because we have picked an arbitrary runtime identifier to flow the version of the latest NETCore.App runtime.
All Runtime.$rid packages should have the same version.
-->
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="7.0.7">
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="7.0.9">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>5b20af47d99620150c53eaf5db8636fdf730b126</Sha>
<Sha>8e9a17b2216f51a5788f8b1c467a4cf3b769e7d7</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Runtime.AOT.win-x64.Cross.browser-wasm" Version="7.0.7">
<Dependency Name="Microsoft.NETCore.App.Runtime.AOT.win-x64.Cross.browser-wasm" Version="7.0.9">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>5b20af47d99620150c53eaf5db8636fdf730b126</Sha>
<Sha>8e9a17b2216f51a5788f8b1c467a4cf3b769e7d7</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.BrowserDebugHost.Transport" Version="7.0.7-servicing.23274.4">
<Dependency Name="Microsoft.NETCore.BrowserDebugHost.Transport" Version="7.0.9-servicing.23320.18">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>5b20af47d99620150c53eaf5db8636fdf730b126</Sha>
<Sha>8e9a17b2216f51a5788f8b1c467a4cf3b769e7d7</Sha>
</Dependency>
<Dependency Name="Microsoft.Web.Xdt" Version="7.0.0-preview.22423.2">
<Uri>https://github.com/dotnet/xdt</Uri>
Expand All @@ -298,9 +298,9 @@
</ProductDependencies>
<ToolsetDependencies>
<!-- Listed explicitly to workaround https://github.com/dotnet/cli/issues/10528 -->
<Dependency Name="Microsoft.NETCore.Platforms" Version="7.0.3">
<Dependency Name="Microsoft.NETCore.Platforms" Version="7.0.4">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>5b20af47d99620150c53eaf5db8636fdf730b126</Sha>
<Sha>8e9a17b2216f51a5788f8b1c467a4cf3b769e7d7</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.23313.4">
<Uri>https://github.com/dotnet/arcade</Uri>
Expand Down
36 changes: 18 additions & 18 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<AspNetCoreMajorVersion>7</AspNetCoreMajorVersion>
<AspNetCoreMinorVersion>0</AspNetCoreMinorVersion>
<AspNetCorePatchVersion>10</AspNetCorePatchVersion>
<ValidateBaseline>false</ValidateBaseline>
<ValidateBaseline>true</ValidateBaseline>
<!--
When StabilizePackageVersion is set to 'true', this branch will produce stable outputs for 'Shipping' packages
-->
Expand Down Expand Up @@ -63,12 +63,12 @@
<PropertyGroup Label="Automated">
<!-- Packages from dotnet/runtime -->
<MicrosoftExtensionsDependencyModelVersion>7.0.0</MicrosoftExtensionsDependencyModelVersion>
<MicrosoftNETCoreAppRefVersion>7.0.7</MicrosoftNETCoreAppRefVersion>
<MicrosoftNETCoreAppRuntimewinx64Version>7.0.7</MicrosoftNETCoreAppRuntimewinx64Version>
<MicrosoftNETRuntimeMonoAOTCompilerTaskVersion>7.0.7</MicrosoftNETRuntimeMonoAOTCompilerTaskVersion>
<MicrosoftNETRuntimeWebAssemblySdkVersion>7.0.7</MicrosoftNETRuntimeWebAssemblySdkVersion>
<MicrosoftNETCoreAppRuntimeAOTwinx64CrossbrowserwasmVersion>7.0.7</MicrosoftNETCoreAppRuntimeAOTwinx64CrossbrowserwasmVersion>
<MicrosoftNETCoreBrowserDebugHostTransportVersion>7.0.7-servicing.23274.4</MicrosoftNETCoreBrowserDebugHostTransportVersion>
<MicrosoftNETCoreAppRefVersion>7.0.9</MicrosoftNETCoreAppRefVersion>
<MicrosoftNETCoreAppRuntimewinx64Version>7.0.9</MicrosoftNETCoreAppRuntimewinx64Version>
<MicrosoftNETRuntimeMonoAOTCompilerTaskVersion>7.0.9</MicrosoftNETRuntimeMonoAOTCompilerTaskVersion>
<MicrosoftNETRuntimeWebAssemblySdkVersion>7.0.9</MicrosoftNETRuntimeWebAssemblySdkVersion>
<MicrosoftNETCoreAppRuntimeAOTwinx64CrossbrowserwasmVersion>7.0.9</MicrosoftNETCoreAppRuntimeAOTwinx64CrossbrowserwasmVersion>
<MicrosoftNETCoreBrowserDebugHostTransportVersion>7.0.9-servicing.23320.18</MicrosoftNETCoreBrowserDebugHostTransportVersion>
<MicrosoftExtensionsCachingAbstractionsVersion>7.0.0</MicrosoftExtensionsCachingAbstractionsVersion>
<MicrosoftExtensionsCachingMemoryVersion>7.0.0</MicrosoftExtensionsCachingMemoryVersion>
<MicrosoftExtensionsConfigurationAbstractionsVersion>7.0.0</MicrosoftExtensionsConfigurationAbstractionsVersion>
Expand Down Expand Up @@ -103,7 +103,7 @@
<MicrosoftExtensionsOptionsDataAnnotationsVersion>7.0.0</MicrosoftExtensionsOptionsDataAnnotationsVersion>
<MicrosoftExtensionsOptionsVersion>7.0.1</MicrosoftExtensionsOptionsVersion>
<MicrosoftExtensionsPrimitivesVersion>7.0.0</MicrosoftExtensionsPrimitivesVersion>
<MicrosoftInternalRuntimeAspNetCoreTransportVersion>7.0.7-servicing.23274.4</MicrosoftInternalRuntimeAspNetCoreTransportVersion>
<MicrosoftInternalRuntimeAspNetCoreTransportVersion>7.0.9-servicing.23320.18</MicrosoftInternalRuntimeAspNetCoreTransportVersion>
<SystemConfigurationConfigurationManagerVersion>7.0.0</SystemConfigurationConfigurationManagerVersion>
<SystemDiagnosticsDiagnosticSourceVersion>7.0.2</SystemDiagnosticsDiagnosticSourceVersion>
<SystemDiagnosticsEventLogVersion>7.0.0</SystemDiagnosticsEventLogVersion>
Expand All @@ -123,16 +123,16 @@
<SystemThreadingChannelsVersion>7.0.0</SystemThreadingChannelsVersion>
<SystemThreadingRateLimitingVersion>7.0.0</SystemThreadingRateLimitingVersion>
<!-- Only listed explicitly to workaround https://github.com/dotnet/cli/issues/10528 -->
<MicrosoftNETCorePlatformsVersion>7.0.3</MicrosoftNETCorePlatformsVersion>
<MicrosoftNETCorePlatformsVersion>7.0.4</MicrosoftNETCorePlatformsVersion>
<!-- Packages from dotnet/efcore -->
<dotnetefVersion>7.0.7</dotnetefVersion>
<MicrosoftEntityFrameworkCoreInMemoryVersion>7.0.7</MicrosoftEntityFrameworkCoreInMemoryVersion>
<MicrosoftEntityFrameworkCoreRelationalVersion>7.0.7</MicrosoftEntityFrameworkCoreRelationalVersion>
<MicrosoftEntityFrameworkCoreSqliteVersion>7.0.7</MicrosoftEntityFrameworkCoreSqliteVersion>
<MicrosoftEntityFrameworkCoreSqlServerVersion>7.0.7</MicrosoftEntityFrameworkCoreSqlServerVersion>
<MicrosoftEntityFrameworkCoreToolsVersion>7.0.7</MicrosoftEntityFrameworkCoreToolsVersion>
<MicrosoftEntityFrameworkCoreVersion>7.0.7</MicrosoftEntityFrameworkCoreVersion>
<MicrosoftEntityFrameworkCoreDesignVersion>7.0.7</MicrosoftEntityFrameworkCoreDesignVersion>
<dotnetefVersion>7.0.9</dotnetefVersion>
<MicrosoftEntityFrameworkCoreInMemoryVersion>7.0.9</MicrosoftEntityFrameworkCoreInMemoryVersion>
<MicrosoftEntityFrameworkCoreRelationalVersion>7.0.9</MicrosoftEntityFrameworkCoreRelationalVersion>
<MicrosoftEntityFrameworkCoreSqliteVersion>7.0.9</MicrosoftEntityFrameworkCoreSqliteVersion>
<MicrosoftEntityFrameworkCoreSqlServerVersion>7.0.9</MicrosoftEntityFrameworkCoreSqlServerVersion>
<MicrosoftEntityFrameworkCoreToolsVersion>7.0.9</MicrosoftEntityFrameworkCoreToolsVersion>
<MicrosoftEntityFrameworkCoreVersion>7.0.9</MicrosoftEntityFrameworkCoreVersion>
<MicrosoftEntityFrameworkCoreDesignVersion>7.0.9</MicrosoftEntityFrameworkCoreDesignVersion>
<!-- Packages from dotnet/arcade -->
<MicrosoftDotNetBuildTasksInstallersVersion>7.0.0-beta.23313.4</MicrosoftDotNetBuildTasksInstallersVersion>
<MicrosoftDotNetBuildTasksTemplatingVersion>7.0.0-beta.23313.4</MicrosoftDotNetBuildTasksTemplatingVersion>
Expand Down Expand Up @@ -238,7 +238,7 @@
<MicrosoftAspNetCoreAzureAppServicesSiteExtension50Version>5.0.17-servicing-22215-7</MicrosoftAspNetCoreAzureAppServicesSiteExtension50Version>
<MicrosoftAspNetCoreAzureAppServicesSiteExtension50x64Version>$(MicrosoftAspNetCoreAzureAppServicesSiteExtension50Version)</MicrosoftAspNetCoreAzureAppServicesSiteExtension50x64Version>
<MicrosoftAspNetCoreAzureAppServicesSiteExtension50x86Version>$(MicrosoftAspNetCoreAzureAppServicesSiteExtension50Version)</MicrosoftAspNetCoreAzureAppServicesSiteExtension50x86Version>
<MicrosoftAspNetCoreAzureAppServicesSiteExtension60Version>6.0.18-servicing-23269-9</MicrosoftAspNetCoreAzureAppServicesSiteExtension60Version>
<MicrosoftAspNetCoreAzureAppServicesSiteExtension60Version>6.0.20-servicing-23321-6</MicrosoftAspNetCoreAzureAppServicesSiteExtension60Version>
<MicrosoftAspNetCoreAzureAppServicesSiteExtension60x64Version>$(MicrosoftAspNetCoreAzureAppServicesSiteExtension60Version)</MicrosoftAspNetCoreAzureAppServicesSiteExtension60x64Version>
<MicrosoftAspNetCoreAzureAppServicesSiteExtension60x86Version>$(MicrosoftAspNetCoreAzureAppServicesSiteExtension60Version)</MicrosoftAspNetCoreAzureAppServicesSiteExtension60x86Version>
<!-- 3rd party dependencies -->
Expand Down
4 changes: 2 additions & 2 deletions global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"sdk": {
"version": "7.0.107"
"version": "7.0.109"
},
"tools": {
"dotnet": "7.0.107",
"dotnet": "7.0.109",
"runtimes": {
"dotnet/x86": [
"$(MicrosoftNETCoreBrowserDebugHostTransportVersion)"
Expand Down
Loading