Skip to content
代码片段 群组 项目
提交 773e8cc3 编辑于 作者: DotNet Bot's avatar DotNet Bot 提交者： Will Godbe
浏览文件

Merged PR 23388: [internal/release/6.0] Update dependencies from... 

Merged PR 23388: [internal/release/6.0] Update dependencies from dnceng/internal/dotnet-efcore dnceng/internal/dotnet-runtime

This pull request updates the following dependencies

[marker]: <> (Begin:1ac68a20-28fc-4e11-3a4d-08d961c5a689)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-efcore
- **Subscription**: 1ac68a20-28fc-4e11-3a4d-08d961c5a689
- **Build**: 20220615.1
- **Date Produced**: June 15, 2022 9:41:06 AM UTC
- **Commit**: 5f5283806774a7fd1bbe2ec54736dc8a5d30c16d
- **Branch**: refs/heads/internal/release/6.0

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **dotnet-ef**: [from 6.0.6 to 6.0.7][10]
  - **Microsoft.EntityFrameworkCore**: [from 6.0.6 to 6.0.7][10]
  - **Microsoft.EntityFrameworkCore.Design**: [from 6.0.6 to 6.0.7][10]
  - **Microsoft.EntityFrameworkCore.InMemory**: [from 6.0.6 to 6.0.7][10]
  - **Microsoft.EntityFrameworkCore.Relational**: [from 6.0.6 to 6.0.7][10]
  - **Microsoft.EntityFrameworkCore.Sqlite**: [from 6.0.6 to 6.0.7][10]
  - **Microsoft.EntityFrameworkCore.SqlServer**: [from 6.0.6 to 6.0.7][10]
  - **Microsoft.EntityFrameworkCore.Tools**: [from 6.0.6 to 6.0.7][10]

[10]: https://dev.azure.com/dnceng/internal/_git/dotnet-efcore/branches?baseVersion=GC796d2f8&targetVersion=GC5f52838&_a=files

[DependencyUpdate]: <> (End)

[marker]: <> (End:1ac68a20-28fc-4e11-3a4d-08d961c5a689)

[marker]: <> (Begin:7745f62d-e15b-4ba3-39b3-08d960f4ca81)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- **Subscription**: 7745f62d-e15b-4ba3-39b3-08d960f4ca81
- **Build**: 20220622.2
- **Date Produced**: June 22, 2022 2:36:52 PM UTC
- **Commit**: 0ec02c8c96e2eda06dc5b5edfdbdba0f36415082
- **Branch**: refs/heads/internal/release/6.0

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.Internal.Runtime.AspNetCore.Transport**: [from 6.0.6-servicing.22267.7 to 6.0.7-servicing.22322.2][12]
  - **Microsoft.NET.Runtime.MonoAOTCompiler.Task**: [from 6.0.6 to 6.0.7][12]
  - **Microsoft.NET.Runtime.WebAssembly.Sdk**: [from 6.0.6 to 6.0.7][12]
  - **Microsoft.NETCore.App.Ref**: [from 6.0.6 to 6.0.7][12]
  - **Microsoft.NETCore.App.Runtime.AOT.win-x64.Cross.browser-wasm**: [from 6.0.6 to 6.0.7][12]
  - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.6 to 6.0.7][12]
  - **Microsoft.NETCore.BrowserDebugHost.Transport**: [from 6.0.6-servicing.22267.7 to 6.0.7-servicing.22322.2][12]
  - **Microsoft.NETCore.Platforms**: [from 6.0.4 to 6.0.5][12]

[12]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC7cca709&targetVersion=GC0ec02c8&_a=files

[DependencyUpdate]: <> (End)

[marker]: <> (End:7745f62d-e15b-4ba3-39b3-08d960f4ca81)
上级 154e31ec
No related branches found
标签 v6.0.7
无相关合并请求
隐藏空白变更内容
行内 左右并排
NuGet.config
+ 4
− 0
浏览文件 @ 773e8cc3
......@@ -4,8 +4,10 @@
<clear />
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
<!-- Begin: Package sources from dotnet-runtime -->
<add key="darc-int-dotnet-runtime-0ec02c8" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-0ec02c8c/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-runtime -->
<!-- Begin: Package sources from dotnet-efcore -->
<add key="darc-int-dotnet-efcore-5f52838" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-efcore-5f528380/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-efcore -->
<!--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" />
......@@ -25,8 +27,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-5f52838" value="true" />
<!-- End: Package sources from dotnet-efcore -->
<!-- Begin: Package sources from dotnet-runtime -->
<add key="darc-int-dotnet-runtime-0ec02c8" value="true" />
<!-- End: Package sources from dotnet-runtime -->
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
</disabledPackageSources>
......
eng/Version.Details.xml
+ 32
− 32
浏览文件 @ 773e8cc3
......@@ -9,37 +9,37 @@
-->
<Dependencies>
<ProductDependencies>
<Dependency Name="dotnet-ef" Version="6.0.6">
<Dependency Name="dotnet-ef" Version="6.0.7">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
<Sha>796d2f8b516781d64bbdf4c21b0163de9fa56ab8</Sha>
<Sha>5f5283806774a7fd1bbe2ec54736dc8a5d30c16d</Sha>
</Dependency>
<Dependency Name="Microsoft.EntityFrameworkCore.InMemory" Version="6.0.6">
<Dependency Name="Microsoft.EntityFrameworkCore.InMemory" Version="6.0.7">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
<Sha>796d2f8b516781d64bbdf4c21b0163de9fa56ab8</Sha>
<Sha>5f5283806774a7fd1bbe2ec54736dc8a5d30c16d</Sha>
</Dependency>
<Dependency Name="Microsoft.EntityFrameworkCore.Relational" Version="6.0.6">
<Dependency Name="Microsoft.EntityFrameworkCore.Relational" Version="6.0.7">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
<Sha>796d2f8b516781d64bbdf4c21b0163de9fa56ab8</Sha>
<Sha>5f5283806774a7fd1bbe2ec54736dc8a5d30c16d</Sha>
</Dependency>
<Dependency Name="Microsoft.EntityFrameworkCore.Sqlite" Version="6.0.6">
<Dependency Name="Microsoft.EntityFrameworkCore.Sqlite" Version="6.0.7">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
<Sha>796d2f8b516781d64bbdf4c21b0163de9fa56ab8</Sha>
<Sha>5f5283806774a7fd1bbe2ec54736dc8a5d30c16d</Sha>
</Dependency>
<Dependency Name="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.6">
<Dependency Name="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.7">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
<Sha>796d2f8b516781d64bbdf4c21b0163de9fa56ab8</Sha>
<Sha>5f5283806774a7fd1bbe2ec54736dc8a5d30c16d</Sha>
</Dependency>
<Dependency Name="Microsoft.EntityFrameworkCore.Tools" Version="6.0.6">
<Dependency Name="Microsoft.EntityFrameworkCore.Tools" Version="6.0.7">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
<Sha>796d2f8b516781d64bbdf4c21b0163de9fa56ab8</Sha>
<Sha>5f5283806774a7fd1bbe2ec54736dc8a5d30c16d</Sha>
</Dependency>
<Dependency Name="Microsoft.EntityFrameworkCore" Version="6.0.6">
<Dependency Name="Microsoft.EntityFrameworkCore" Version="6.0.7">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
<Sha>796d2f8b516781d64bbdf4c21b0163de9fa56ab8</Sha>
<Sha>5f5283806774a7fd1bbe2ec54736dc8a5d30c16d</Sha>
</Dependency>
<Dependency Name="Microsoft.EntityFrameworkCore.Design" Version="6.0.6">
<Dependency Name="Microsoft.EntityFrameworkCore.Design" Version="6.0.7">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
<Sha>796d2f8b516781d64bbdf4c21b0163de9fa56ab8</Sha>
<Sha>5f5283806774a7fd1bbe2ec54736dc8a5d30c16d</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Caching.Abstractions" Version="6.0.0">
<Uri>https://github.com/dotnet/runtime</Uri>
......@@ -177,9 +177,9 @@
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>4822e3c3aa77eb82b2fb33c9321f923cf11ddde6</Sha>
</Dependency>
<Dependency Name="Microsoft.Internal.Runtime.AspNetCore.Transport" Version="6.0.6-servicing.22267.7">
<Dependency Name="Microsoft.Internal.Runtime.AspNetCore.Transport" Version="6.0.7-servicing.22322.2">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>7cca709db2944a09b4db6ca7b20c457ff260fb5a</Sha>
<Sha>0ec02c8c96e2eda06dc5b5edfdbdba0f36415082</Sha>
</Dependency>
<Dependency Name="System.Diagnostics.DiagnosticSource" Version="6.0.0">
<Uri>https://github.com/dotnet/runtime</Uri>
......@@ -245,40 +245,40 @@
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>4822e3c3aa77eb82b2fb33c9321f923cf11ddde6</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="6.0.6">
<Dependency Name="Microsoft.NETCore.App.Ref" Version="6.0.7">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>7cca709db2944a09b4db6ca7b20c457ff260fb5a</Sha>
<Sha>0ec02c8c96e2eda06dc5b5edfdbdba0f36415082</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Runtime.MonoAOTCompiler.Task" Version="6.0.6">
<Dependency Name="Microsoft.NET.Runtime.MonoAOTCompiler.Task" Version="6.0.7">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>7cca709db2944a09b4db6ca7b20c457ff260fb5a</Sha>
<Sha>0ec02c8c96e2eda06dc5b5edfdbdba0f36415082</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Runtime.WebAssembly.Sdk" Version="6.0.6">
<Dependency Name="Microsoft.NET.Runtime.WebAssembly.Sdk" Version="6.0.7">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>7cca709db2944a09b4db6ca7b20c457ff260fb5a</Sha>
<Sha>0ec02c8c96e2eda06dc5b5edfdbdba0f36415082</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="6.0.6">
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="6.0.7">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>7cca709db2944a09b4db6ca7b20c457ff260fb5a</Sha>
<Sha>0ec02c8c96e2eda06dc5b5edfdbdba0f36415082</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Runtime.AOT.win-x64.Cross.browser-wasm" Version="6.0.6">
<Dependency Name="Microsoft.NETCore.App.Runtime.AOT.win-x64.Cross.browser-wasm" Version="6.0.7">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>7cca709db2944a09b4db6ca7b20c457ff260fb5a</Sha>
<Sha>0ec02c8c96e2eda06dc5b5edfdbdba0f36415082</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.BrowserDebugHost.Transport" Version="6.0.6-servicing.22267.7">
<Dependency Name="Microsoft.NETCore.BrowserDebugHost.Transport" Version="6.0.7-servicing.22322.2">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>7cca709db2944a09b4db6ca7b20c457ff260fb5a</Sha>
<Sha>0ec02c8c96e2eda06dc5b5edfdbdba0f36415082</Sha>
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<!-- Listed explicitly to workaround https://github.com/dotnet/cli/issues/10528 -->
<Dependency Name="Microsoft.NETCore.Platforms" Version="6.0.4">
<Dependency Name="Microsoft.NETCore.Platforms" Version="6.0.5">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>7cca709db2944a09b4db6ca7b20c457ff260fb5a</Sha>
<Sha>0ec02c8c96e2eda06dc5b5edfdbdba0f36415082</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.22314.7">
<Uri>https://github.com/dotnet/arcade</Uri>
......
eng/Versions.props
+ 16
− 16
浏览文件 @ 773e8cc3
......@@ -63,12 +63,12 @@
<PropertyGroup Label="Automated">
<!-- Packages from dotnet/runtime -->
<MicrosoftExtensionsDependencyModelVersion>6.0.0</MicrosoftExtensionsDependencyModelVersion>
<MicrosoftNETCoreAppRefVersion>6.0.6</MicrosoftNETCoreAppRefVersion>
<MicrosoftNETCoreAppRuntimewinx64Version>6.0.6</MicrosoftNETCoreAppRuntimewinx64Version>
<MicrosoftNETRuntimeMonoAOTCompilerTaskVersion>6.0.6</MicrosoftNETRuntimeMonoAOTCompilerTaskVersion>
<MicrosoftNETRuntimeWebAssemblySdkVersion>6.0.6</MicrosoftNETRuntimeWebAssemblySdkVersion>
<MicrosoftNETCoreAppRuntimeAOTwinx64CrossbrowserwasmVersion>6.0.6</MicrosoftNETCoreAppRuntimeAOTwinx64CrossbrowserwasmVersion>
<MicrosoftNETCoreBrowserDebugHostTransportVersion>6.0.6-servicing.22267.7</MicrosoftNETCoreBrowserDebugHostTransportVersion>
<MicrosoftNETCoreAppRefVersion>6.0.7</MicrosoftNETCoreAppRefVersion>
<MicrosoftNETCoreAppRuntimewinx64Version>6.0.7</MicrosoftNETCoreAppRuntimewinx64Version>
<MicrosoftNETRuntimeMonoAOTCompilerTaskVersion>6.0.7</MicrosoftNETRuntimeMonoAOTCompilerTaskVersion>
<MicrosoftNETRuntimeWebAssemblySdkVersion>6.0.7</MicrosoftNETRuntimeWebAssemblySdkVersion>
<MicrosoftNETCoreAppRuntimeAOTwinx64CrossbrowserwasmVersion>6.0.7</MicrosoftNETCoreAppRuntimeAOTwinx64CrossbrowserwasmVersion>
<MicrosoftNETCoreBrowserDebugHostTransportVersion>6.0.7-servicing.22322.2</MicrosoftNETCoreBrowserDebugHostTransportVersion>
<MicrosoftExtensionsCachingAbstractionsVersion>6.0.0</MicrosoftExtensionsCachingAbstractionsVersion>
<MicrosoftExtensionsCachingMemoryVersion>6.0.1</MicrosoftExtensionsCachingMemoryVersion>
<MicrosoftExtensionsConfigurationAbstractionsVersion>6.0.0</MicrosoftExtensionsConfigurationAbstractionsVersion>
......@@ -103,7 +103,7 @@
<MicrosoftExtensionsOptionsDataAnnotationsVersion>6.0.0</MicrosoftExtensionsOptionsDataAnnotationsVersion>
<MicrosoftExtensionsOptionsVersion>6.0.0</MicrosoftExtensionsOptionsVersion>
<MicrosoftExtensionsPrimitivesVersion>6.0.0</MicrosoftExtensionsPrimitivesVersion>
<MicrosoftInternalRuntimeAspNetCoreTransportVersion>6.0.6-servicing.22267.7</MicrosoftInternalRuntimeAspNetCoreTransportVersion>
<MicrosoftInternalRuntimeAspNetCoreTransportVersion>6.0.7-servicing.22322.2</MicrosoftInternalRuntimeAspNetCoreTransportVersion>
<SystemDiagnosticsDiagnosticSourceVersion>6.0.0</SystemDiagnosticsDiagnosticSourceVersion>
<SystemDiagnosticsEventLogVersion>6.0.0</SystemDiagnosticsEventLogVersion>
<SystemDirectoryServicesProtocolsVersion>6.0.1</SystemDirectoryServicesProtocolsVersion>
......@@ -120,16 +120,16 @@
<SystemTextJsonVersion>6.0.5</SystemTextJsonVersion>
<SystemThreadingChannelsVersion>6.0.0</SystemThreadingChannelsVersion>
<!-- Only listed explicitly to workaround https://github.com/dotnet/cli/issues/10528 -->
<MicrosoftNETCorePlatformsVersion>6.0.4</MicrosoftNETCorePlatformsVersion>
<MicrosoftNETCorePlatformsVersion>6.0.5</MicrosoftNETCorePlatformsVersion>
<!-- Packages from dotnet/efcore -->
<dotnetefVersion>6.0.6</dotnetefVersion>
<MicrosoftEntityFrameworkCoreInMemoryVersion>6.0.6</MicrosoftEntityFrameworkCoreInMemoryVersion>
<MicrosoftEntityFrameworkCoreRelationalVersion>6.0.6</MicrosoftEntityFrameworkCoreRelationalVersion>
<MicrosoftEntityFrameworkCoreSqliteVersion>6.0.6</MicrosoftEntityFrameworkCoreSqliteVersion>
<MicrosoftEntityFrameworkCoreSqlServerVersion>6.0.6</MicrosoftEntityFrameworkCoreSqlServerVersion>
<MicrosoftEntityFrameworkCoreToolsVersion>6.0.6</MicrosoftEntityFrameworkCoreToolsVersion>
<MicrosoftEntityFrameworkCoreVersion>6.0.6</MicrosoftEntityFrameworkCoreVersion>
<MicrosoftEntityFrameworkCoreDesignVersion>6.0.6</MicrosoftEntityFrameworkCoreDesignVersion>
<dotnetefVersion>6.0.7</dotnetefVersion>
<MicrosoftEntityFrameworkCoreInMemoryVersion>6.0.7</MicrosoftEntityFrameworkCoreInMemoryVersion>
<MicrosoftEntityFrameworkCoreRelationalVersion>6.0.7</MicrosoftEntityFrameworkCoreRelationalVersion>
<MicrosoftEntityFrameworkCoreSqliteVersion>6.0.7</MicrosoftEntityFrameworkCoreSqliteVersion>
<MicrosoftEntityFrameworkCoreSqlServerVersion>6.0.7</MicrosoftEntityFrameworkCoreSqlServerVersion>
<MicrosoftEntityFrameworkCoreToolsVersion>6.0.7</MicrosoftEntityFrameworkCoreToolsVersion>
<MicrosoftEntityFrameworkCoreVersion>6.0.7</MicrosoftEntityFrameworkCoreVersion>
<MicrosoftEntityFrameworkCoreDesignVersion>6.0.7</MicrosoftEntityFrameworkCoreDesignVersion>
<!-- Packages from dotnet/arcade -->
<MicrosoftDotNetBuildTasksInstallersVersion>6.0.0-beta.22314.7</MicrosoftDotNetBuildTasksInstallersVersion>
<MicrosoftDotNetBuildTasksTemplatingVersion>6.0.0-beta.22314.7</MicrosoftDotNetBuildTasksTemplatingVersion>
......
src/Servers/IIS/IIS/test/Common.FunctionalTests/StartupTests.cs
+ 1
− 1
浏览文件 @ 773e8cc3
......@@ -426,7 +426,7 @@ namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests
Assert.Equal(HttpStatusCode.InternalServerError, response.StatusCode);
var responseContent = await response.Content.ReadAsStringAsync();
Assert.Contains("500.31", responseContent);
Assert.Contains("The framework 'Microsoft.NETCore.App', version '2.9.9'", responseContent);
Assert.Contains("Framework: 'Microsoft.NETCore.App', version '2.9.9'", responseContent);
}
else
{
......
src/Servers/IIS/IIS/test/IIS.Shared.FunctionalTests/StdOutRedirectionTests.cs
+ 9
− 4
浏览文件 @ 773e8cc3
......@@ -47,7 +47,9 @@ namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests
StopServer();
EventLogHelpers.VerifyEventLogEvent(deploymentResult,
@"The framework 'Microsoft.NETCore.App', version '2.9.9' \(x64\) was not found.", Logger);
@"Framework: 'Microsoft.NETCore.App', version '2.9.9' \(x64\)", Logger);
EventLogHelpers.VerifyEventLogEvent(deploymentResult,
"To install missing framework, download:", Logger);
}
[ConditionalFact]
......@@ -69,10 +71,13 @@ namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests
StopServer();
var contents = Helpers.ReadAllTextFromFile(Helpers.GetExpectedLogName(deploymentResult, LogFolderPath), Logger);
var expectedString = "The framework 'Microsoft.NETCore.App', version '2.9.9' (x64) was not found.";
var missingFrameworkString = "To install missing framework, download:";
EventLogHelpers.VerifyEventLogEvent(deploymentResult,
@"Framework: 'Microsoft.NETCore.App', version '2.9.9' \(x64\)", Logger);
EventLogHelpers.VerifyEventLogEvent(deploymentResult,
@"The framework 'Microsoft.NETCore.App', version '2.9.9' \(x64\) was not found.", Logger);
Assert.Contains(expectedString, contents);
missingFrameworkString, Logger);
Assert.Contains(@"Framework: 'Microsoft.NETCore.App', version '2.9.9' (x64)", contents);
Assert.Contains(missingFrameworkString, contents);
}
[ConditionalFact]
......
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或