diff --git a/NuGet.config b/NuGet.config
index 4b821f800992e3c37517c61bef0dc570f13f4abf..810921d0807f7c073c31260a17e728e2c6cfd90e 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -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>
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index d8bbfe40911e307766802f977d6beb4eadb39f42..be56603fef0257f0eb692ef2b1a769eaf0fd90b1 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -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>
diff --git a/eng/Versions.props b/eng/Versions.props
index 3754e8634b06aac571e0598e15465fcd7be5aeb5..038840512db865392aab8c6c387f04bb65cb62ac 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -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>
diff --git a/src/Servers/IIS/IIS/test/Common.FunctionalTests/StartupTests.cs b/src/Servers/IIS/IIS/test/Common.FunctionalTests/StartupTests.cs
index e6acee1a6d43e27d664889ed26d86e55a3162832..822bc2f34ac06d0533b528b800b236d5633fd45c 100644
--- a/src/Servers/IIS/IIS/test/Common.FunctionalTests/StartupTests.cs
+++ b/src/Servers/IIS/IIS/test/Common.FunctionalTests/StartupTests.cs
@@ -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
{
diff --git a/src/Servers/IIS/IIS/test/IIS.Shared.FunctionalTests/StdOutRedirectionTests.cs b/src/Servers/IIS/IIS/test/IIS.Shared.FunctionalTests/StdOutRedirectionTests.cs
index 8868e24c3226b4082fb60a25bd26537d75c2031a..648f3ce92399a4d01d6fa6243d8b0dd7f9095c30 100644
--- a/src/Servers/IIS/IIS/test/IIS.Shared.FunctionalTests/StdOutRedirectionTests.cs
+++ b/src/Servers/IIS/IIS/test/IIS.Shared.FunctionalTests/StdOutRedirectionTests.cs
@@ -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]