Skip to content
代码片段 群组 项目
未验证 提交 ec68a6b2 编辑于 作者: William Godbe's avatar William Godbe 提交者： GitHub
浏览文件

Merge pull request #42694 from wtgodbe/internal-merge-6.0-2022-07-12-1057 

Merging internal commits for release/6.0
上级 764a0f9a 12708ca9
No related branches found
No related tags found
无相关合并请求
展开全部 隐藏空白变更内容
行内 左右并排
显示
有 396 个添加 和 387 个删除
NuGet.config
+ 4
− 0
浏览文件 @ ec68a6b2
...@@ -4,8 +4,10 @@ ...@@ -4,8 +4,10 @@
<clear /> <clear />
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.--> <!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
<!-- Begin: Package sources from dotnet-runtime --> <!-- 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 --> <!-- End: Package sources from dotnet-runtime -->
<!-- Begin: Package sources from dotnet-efcore --> <!-- 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 from dotnet-efcore -->
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.--> <!--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" /> <add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
...@@ -25,8 +27,10 @@ ...@@ -25,8 +27,10 @@
<clear /> <clear />
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.--> <!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
<!-- Begin: Package sources from dotnet-efcore --> <!-- Begin: Package sources from dotnet-efcore -->
<add key="darc-int-dotnet-efcore-5f52838" value="true" />
<!-- End: Package sources from dotnet-efcore --> <!-- End: Package sources from dotnet-efcore -->
<!-- Begin: Package sources from dotnet-runtime --> <!-- Begin: Package sources from dotnet-runtime -->
<add key="darc-int-dotnet-runtime-0ec02c8" value="true" />
<!-- End: Package sources from dotnet-runtime --> <!-- End: Package sources from dotnet-runtime -->
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.--> <!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
</disabledPackageSources> </disabledPackageSources>
......
eng/Baseline.Designer.props
+ 222
− 222
浏览文件 @ ec68a6b2
此差异已折叠。
eng/Baseline.xml
+ 107
− 107
浏览文件 @ ec68a6b2
...@@ -4,111 +4,111 @@ This file contains a list of all the packages and their versions which were rele ...@@ -4,111 +4,111 @@ This file contains a list of all the packages and their versions which were rele
Update this list when preparing for a new patch. Update this list when preparing for a new patch.
--> -->
<Baseline Version="6.0.6"> <Baseline Version="6.0.7">
<Package Id="AspNetCoreRuntime.6.0.x64" Version="6.0.6" /> <Package Id="AspNetCoreRuntime.6.0.x64" Version="6.0.7" />
<Package Id="AspNetCoreRuntime.6.0.x86" Version="6.0.6" /> <Package Id="AspNetCoreRuntime.6.0.x86" Version="6.0.7" />
<Package Id="dotnet-sql-cache" Version="6.0.6" /> <Package Id="dotnet-sql-cache" Version="6.0.7" />
<Package Id="Microsoft.AspNetCore.ApiAuthorization.IdentityServer" Version="6.0.6" /> <Package Id="Microsoft.AspNetCore.ApiAuthorization.IdentityServer" Version="6.0.7" />
<Package Id="Microsoft.AspNetCore.App.Ref" Version="6.0.6" /> <Package Id="Microsoft.AspNetCore.App.Ref" Version="6.0.7" />
<Package Id="Microsoft.AspNetCore.App.Runtime.linux-arm" Version="6.0.6" /> <Package Id="Microsoft.AspNetCore.App.Runtime.linux-arm" Version="6.0.7" />
<Package Id="Microsoft.AspNetCore.App.Runtime.linux-arm64" Version="6.0.6" /> <Package Id="Microsoft.AspNetCore.App.Runtime.linux-arm64" Version="6.0.7" />
<Package Id="Microsoft.AspNetCore.App.Runtime.linux-musl-arm" Version="6.0.6" /> <Package Id="Microsoft.AspNetCore.App.Runtime.linux-musl-arm" Version="6.0.7" />
<Package Id="Microsoft.AspNetCore.App.Runtime.linux-musl-arm64" Version="6.0.6" /> <Package Id="Microsoft.AspNetCore.App.Runtime.linux-musl-arm64" Version="6.0.7" />
<Package Id="Microsoft.AspNetCore.App.Runtime.linux-musl-x64" Version="6.0.6" /> <Package Id="Microsoft.AspNetCore.App.Runtime.linux-musl-x64" Version="6.0.7" />
<Package Id="Microsoft.AspNetCore.App.Runtime.linux-x64" Version="6.0.6" /> <Package Id="Microsoft.AspNetCore.App.Runtime.linux-x64" Version="6.0.7" />
<Package Id="Microsoft.AspNetCore.App.Runtime.osx-arm64" Version="6.0.6" /> <Package Id="Microsoft.AspNetCore.App.Runtime.osx-arm64" Version="6.0.7" />
<Package Id="Microsoft.AspNetCore.App.Runtime.osx-x64" Version="6.0.6" /> <Package Id="Microsoft.AspNetCore.App.Runtime.osx-x64" Version="6.0.7" />
<Package Id="Microsoft.AspNetCore.App.Runtime.win-arm" Version="6.0.6" /> <Package Id="Microsoft.AspNetCore.App.Runtime.win-arm" Version="6.0.7" />
<Package Id="Microsoft.AspNetCore.App.Runtime.win-arm64" Version="6.0.6" /> <Package Id="Microsoft.AspNetCore.App.Runtime.win-arm64" Version="6.0.7" />
<Package Id="Microsoft.AspNetCore.App.Runtime.win-x64" Version="6.0.6" /> <Package Id="Microsoft.AspNetCore.App.Runtime.win-x64" Version="6.0.7" />
<Package Id="Microsoft.AspNetCore.App.Runtime.win-x86" Version="6.0.6" /> <Package Id="Microsoft.AspNetCore.App.Runtime.win-x86" Version="6.0.7" />
<Package Id="Microsoft.AspNetCore.Authentication.AzureAD.UI" Version="6.0.6" /> <Package Id="Microsoft.AspNetCore.Authentication.AzureAD.UI" Version="6.0.7" />
<Package Id="Microsoft.AspNetCore.Authentication.AzureADB2C.UI" Version="6.0.6" /> <Package Id="Microsoft.AspNetCore.Authentication.AzureADB2C.UI" Version="6.0.7" />
<Package Id="Microsoft.AspNetCore.Authentication.Certificate" Version="6.0.6" /> <Package Id="Microsoft.AspNetCore.Authentication.Certificate" Version="6.0.7" />
<Package Id="Microsoft.AspNetCore.Authentication.Facebook" Version="6.0.6" /> <Package Id="Microsoft.AspNetCore.Authentication.Facebook" Version="6.0.7" />
<Package Id="Microsoft.AspNetCore.Authentication.Google" Version="6.0.6" /> <Package Id="Microsoft.AspNetCore.Authentication.Google" Version="6.0.7" />
<Package Id="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.6" /> <Package Id="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.7" />
<Package Id="Microsoft.AspNetCore.Authentication.MicrosoftAccount" Version="6.0.6" /> <Package Id="Microsoft.AspNetCore.Authentication.MicrosoftAccount" Version="6.0.7" />
<Package Id="Microsoft.AspNetCore.Authentication.Negotiate" Version="6.0.6" /> <Package Id="Microsoft.AspNetCore.Authentication.Negotiate" Version="6.0.7" />
<Package Id="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="6.0.6" /> <Package Id="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="6.0.7" />
<Package Id="Microsoft.AspNetCore.Authentication.Twitter" Version="6.0.6" /> <Package Id="Microsoft.AspNetCore.Authentication.Twitter" Version="6.0.7" />
<Package Id="Microsoft.AspNetCore.Authentication.WsFederation" Version="6.0.6" /> <Package Id="Microsoft.AspNetCore.Authentication.WsFederation" Version="6.0.7" />
<Package Id="Microsoft.AspNetCore.Authorization" Version="6.0.6" /> <Package Id="Microsoft.AspNetCore.Authorization" Version="6.0.7" />
<Package Id="Microsoft.AspNetCore.AzureAppServices.HostingStartup" Version="6.0.6" /> <Package Id="Microsoft.AspNetCore.AzureAppServices.HostingStartup" Version="6.0.7" />
<Package Id="Microsoft.AspNetCore.AzureAppServices.SiteExtension" Version="6.0.6" /> <Package Id="Microsoft.AspNetCore.AzureAppServices.SiteExtension" Version="6.0.7" />
<Package Id="Microsoft.AspNetCore.AzureAppServicesIntegration" Version="6.0.6" /> <Package Id="Microsoft.AspNetCore.AzureAppServicesIntegration" Version="6.0.7" />
<Package Id="Microsoft.AspNetCore.Components" Version="6.0.6" /> <Package Id="Microsoft.AspNetCore.Components" Version="6.0.7" />
<Package Id="Microsoft.AspNetCore.Components.Analyzers" Version="6.0.6" /> <Package Id="Microsoft.AspNetCore.Components.Analyzers" Version="6.0.7" />
<Package Id="Microsoft.AspNetCore.Components.Authorization" Version="6.0.6" /> <Package Id="Microsoft.AspNetCore.Components.Authorization" Version="6.0.7" />
<Package Id="Microsoft.AspNetCore.Components.Forms" Version="6.0.6" /> <Package Id="Microsoft.AspNetCore.Components.Forms" Version="6.0.7" />
<Package Id="Microsoft.AspNetCore.Components.Web" Version="6.0.6" /> <Package Id="Microsoft.AspNetCore.Components.Web" Version="6.0.7" />
<Package Id="Microsoft.AspNetCore.Components.WebAssembly" Version="6.0.6" /> <Package Id="Microsoft.AspNetCore.Components.WebAssembly" Version="6.0.7" />
<Package Id="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="6.0.6" /> <Package Id="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="6.0.7" />
<Package Id="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="6.0.6" /> <Package Id="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="6.0.7" />
<Package Id="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="6.0.6" /> <Package Id="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="6.0.7" />
<Package Id="Microsoft.AspNetCore.Components.WebView" Version="6.0.6" /> <Package Id="Microsoft.AspNetCore.Components.WebView" Version="6.0.7" />
<Package Id="Microsoft.AspNetCore.ConcurrencyLimiter" Version="6.0.6" /> <Package Id="Microsoft.AspNetCore.ConcurrencyLimiter" Version="6.0.7" />
<Package Id="Microsoft.AspNetCore.Connections.Abstractions" Version="6.0.6" /> <Package Id="Microsoft.AspNetCore.Connections.Abstractions" Version="6.0.7" />
<Package Id="Microsoft.AspNetCore.Cryptography.Internal" Version="6.0.6" /> <Package Id="Microsoft.AspNetCore.Cryptography.Internal" Version="6.0.7" />
<Package Id="Microsoft.AspNetCore.Cryptography.KeyDerivation" Version="6.0.6" /> <Package Id="Microsoft.AspNetCore.Cryptography.KeyDerivation" Version="6.0.7" />
<Package Id="Microsoft.AspNetCore.DataProtection" Version="6.0.6" /> <Package Id="Microsoft.AspNetCore.DataProtection" Version="6.0.7" />
<Package Id="Microsoft.AspNetCore.DataProtection.Abstractions" Version="6.0.6" /> <Package Id="Microsoft.AspNetCore.DataProtection.Abstractions" Version="6.0.7" />
<Package Id="Microsoft.AspNetCore.DataProtection.EntityFrameworkCore" Version="6.0.6" /> <Package Id="Microsoft.AspNetCore.DataProtection.EntityFrameworkCore" Version="6.0.7" />
<Package Id="Microsoft.AspNetCore.DataProtection.Extensions" Version="6.0.6" /> <Package Id="Microsoft.AspNetCore.DataProtection.Extensions" Version="6.0.7" />
<Package Id="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="6.0.6" /> <Package Id="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="6.0.7" />
<Package Id="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="6.0.6" /> <Package Id="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="6.0.7" />
<Package Id="Microsoft.AspNetCore.HeaderPropagation" Version="6.0.6" /> <Package Id="Microsoft.AspNetCore.HeaderPropagation" Version="6.0.7" />
<Package Id="Microsoft.AspNetCore.Hosting.WindowsServices" Version="6.0.6" /> <Package Id="Microsoft.AspNetCore.Hosting.WindowsServices" Version="6.0.7" />
<Package Id="Microsoft.AspNetCore.Http.Connections.Client" Version="6.0.6" /> <Package Id="Microsoft.AspNetCore.Http.Connections.Client" Version="6.0.7" />
<Package Id="Microsoft.AspNetCore.Http.Connections.Common" Version="6.0.6" /> <Package Id="Microsoft.AspNetCore.Http.Connections.Common" Version="6.0.7" />
<Package Id="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="6.0.6" /> <Package Id="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="6.0.7" />
<Package Id="Microsoft.AspNetCore.Identity.UI" Version="6.0.6" /> <Package Id="Microsoft.AspNetCore.Identity.UI" Version="6.0.7" />
<Package Id="Microsoft.AspNetCore.JsonPatch" Version="6.0.6" /> <Package Id="Microsoft.AspNetCore.JsonPatch" Version="6.0.7" />
<Package Id="Microsoft.AspNetCore.Metadata" Version="6.0.6" /> <Package Id="Microsoft.AspNetCore.Metadata" Version="6.0.7" />
<Package Id="Microsoft.AspNetCore.MiddlewareAnalysis" Version="6.0.6" /> <Package Id="Microsoft.AspNetCore.MiddlewareAnalysis" Version="6.0.7" />
<Package Id="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.6" /> <Package Id="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.7" />
<Package Id="Microsoft.AspNetCore.Mvc.Razor.Extensions" Version="6.0.6" /> <Package Id="Microsoft.AspNetCore.Mvc.Razor.Extensions" Version="6.0.7" />
<Package Id="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="6.0.6" /> <Package Id="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="6.0.7" />
<Package Id="Microsoft.AspNetCore.Mvc.Testing" Version="6.0.6" /> <Package Id="Microsoft.AspNetCore.Mvc.Testing" Version="6.0.7" />
<Package Id="Microsoft.AspNetCore.Owin" Version="6.0.6" /> <Package Id="Microsoft.AspNetCore.Owin" Version="6.0.7" />
<Package Id="Microsoft.AspNetCore.Razor.Language" Version="6.0.6" /> <Package Id="Microsoft.AspNetCore.Razor.Language" Version="6.0.7" />
<Package Id="Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv" Version="6.0.6" /> <Package Id="Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv" Version="6.0.7" />
<Package Id="Microsoft.AspNetCore.SignalR.Client" Version="6.0.6" /> <Package Id="Microsoft.AspNetCore.SignalR.Client" Version="6.0.7" />
<Package Id="Microsoft.AspNetCore.SignalR.Client.Core" Version="6.0.6" /> <Package Id="Microsoft.AspNetCore.SignalR.Client.Core" Version="6.0.7" />
<Package Id="Microsoft.AspNetCore.SignalR.Common" Version="6.0.6" /> <Package Id="Microsoft.AspNetCore.SignalR.Common" Version="6.0.7" />
<Package Id="Microsoft.AspNetCore.SignalR.Protocols.Json" Version="6.0.6" /> <Package Id="Microsoft.AspNetCore.SignalR.Protocols.Json" Version="6.0.7" />
<Package Id="Microsoft.AspNetCore.SignalR.Protocols.MessagePack" Version="6.0.6" /> <Package Id="Microsoft.AspNetCore.SignalR.Protocols.MessagePack" Version="6.0.7" />
<Package Id="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" Version="6.0.6" /> <Package Id="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" Version="6.0.7" />
<Package Id="Microsoft.AspNetCore.SignalR.Specification.Tests" Version="6.0.6" /> <Package Id="Microsoft.AspNetCore.SignalR.Specification.Tests" Version="6.0.7" />
<Package Id="Microsoft.AspNetCore.SignalR.StackExchangeRedis" Version="6.0.6" /> <Package Id="Microsoft.AspNetCore.SignalR.StackExchangeRedis" Version="6.0.7" />
<Package Id="Microsoft.AspNetCore.SpaProxy" Version="6.0.6" /> <Package Id="Microsoft.AspNetCore.SpaProxy" Version="6.0.7" />
<Package Id="Microsoft.AspNetCore.SpaServices.Extensions" Version="6.0.6" /> <Package Id="Microsoft.AspNetCore.SpaServices.Extensions" Version="6.0.7" />
<Package Id="Microsoft.AspNetCore.TestHost" Version="6.0.6" /> <Package Id="Microsoft.AspNetCore.TestHost" Version="6.0.7" />
<Package Id="Microsoft.Authentication.WebAssembly.Msal" Version="6.0.6" /> <Package Id="Microsoft.Authentication.WebAssembly.Msal" Version="6.0.7" />
<Package Id="Microsoft.CodeAnalysis.Razor" Version="6.0.6" /> <Package Id="Microsoft.CodeAnalysis.Razor" Version="6.0.7" />
<Package Id="Microsoft.dotnet-openapi" Version="6.0.6" /> <Package Id="Microsoft.dotnet-openapi" Version="6.0.7" />
<Package Id="Microsoft.DotNet.Web.Client.ItemTemplates" Version="6.0.6" /> <Package Id="Microsoft.DotNet.Web.Client.ItemTemplates" Version="6.0.7" />
<Package Id="Microsoft.DotNet.Web.ItemTemplates.6.0" Version="6.0.6" /> <Package Id="Microsoft.DotNet.Web.ItemTemplates.6.0" Version="6.0.7" />
<Package Id="Microsoft.DotNet.Web.ProjectTemplates.6.0" Version="6.0.6" /> <Package Id="Microsoft.DotNet.Web.ProjectTemplates.6.0" Version="6.0.7" />
<Package Id="Microsoft.DotNet.Web.Spa.ProjectTemplates.6.0" Version="6.0.6" /> <Package Id="Microsoft.DotNet.Web.Spa.ProjectTemplates.6.0" Version="6.0.7" />
<Package Id="Microsoft.Extensions.ApiDescription.Client" Version="6.0.6" /> <Package Id="Microsoft.Extensions.ApiDescription.Client" Version="6.0.7" />
<Package Id="Microsoft.Extensions.ApiDescription.Server" Version="6.0.6" /> <Package Id="Microsoft.Extensions.ApiDescription.Server" Version="6.0.7" />
<Package Id="Microsoft.Extensions.Caching.SqlServer" Version="6.0.6" /> <Package Id="Microsoft.Extensions.Caching.SqlServer" Version="6.0.7" />
<Package Id="Microsoft.Extensions.Caching.StackExchangeRedis" Version="6.0.6" /> <Package Id="Microsoft.Extensions.Caching.StackExchangeRedis" Version="6.0.7" />
<Package Id="Microsoft.Extensions.Configuration.KeyPerFile" Version="6.0.6" /> <Package Id="Microsoft.Extensions.Configuration.KeyPerFile" Version="6.0.7" />
<Package Id="Microsoft.Extensions.Diagnostics.HealthChecks" Version="6.0.6" /> <Package Id="Microsoft.Extensions.Diagnostics.HealthChecks" Version="6.0.7" />
<Package Id="Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions" Version="6.0.6" /> <Package Id="Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions" Version="6.0.7" />
<Package Id="Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore" Version="6.0.6" /> <Package Id="Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore" Version="6.0.7" />
<Package Id="Microsoft.Extensions.Features" Version="6.0.6" /> <Package Id="Microsoft.Extensions.Features" Version="6.0.7" />
<Package Id="Microsoft.Extensions.FileProviders.Embedded" Version="6.0.6" /> <Package Id="Microsoft.Extensions.FileProviders.Embedded" Version="6.0.7" />
<Package Id="Microsoft.Extensions.Http.Polly" Version="6.0.6" /> <Package Id="Microsoft.Extensions.Http.Polly" Version="6.0.7" />
<Package Id="Microsoft.Extensions.Identity.Core" Version="6.0.6" /> <Package Id="Microsoft.Extensions.Identity.Core" Version="6.0.7" />
<Package Id="Microsoft.Extensions.Identity.Stores" Version="6.0.6" /> <Package Id="Microsoft.Extensions.Identity.Stores" Version="6.0.7" />
<Package Id="Microsoft.Extensions.Localization" Version="6.0.6" /> <Package Id="Microsoft.Extensions.Localization" Version="6.0.7" />
<Package Id="Microsoft.Extensions.Localization.Abstractions" Version="6.0.6" /> <Package Id="Microsoft.Extensions.Localization.Abstractions" Version="6.0.7" />
<Package Id="Microsoft.Extensions.Logging.AzureAppServices" Version="6.0.6" /> <Package Id="Microsoft.Extensions.Logging.AzureAppServices" Version="6.0.7" />
<Package Id="Microsoft.Extensions.ObjectPool" Version="6.0.6" /> <Package Id="Microsoft.Extensions.ObjectPool" Version="6.0.7" />
<Package Id="Microsoft.Extensions.WebEncoders" Version="6.0.6" /> <Package Id="Microsoft.Extensions.WebEncoders" Version="6.0.7" />
<Package Id="Microsoft.JSInterop" Version="6.0.6" /> <Package Id="Microsoft.JSInterop" Version="6.0.7" />
<Package Id="Microsoft.JSInterop.WebAssembly" Version="6.0.6" /> <Package Id="Microsoft.JSInterop.WebAssembly" Version="6.0.7" />
</Baseline> </Baseline>
\ No newline at end of file
eng/Version.Details.xml
+ 32
− 32
浏览文件 @ ec68a6b2
...@@ -9,37 +9,37 @@ ...@@ -9,37 +9,37 @@
--> -->
<Dependencies> <Dependencies>
<ProductDependencies> <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> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
<Sha>796d2f8b516781d64bbdf4c21b0163de9fa56ab8</Sha> <Sha>5f5283806774a7fd1bbe2ec54736dc8a5d30c16d</Sha>
</Dependency> </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> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
<Sha>796d2f8b516781d64bbdf4c21b0163de9fa56ab8</Sha> <Sha>5f5283806774a7fd1bbe2ec54736dc8a5d30c16d</Sha>
</Dependency> </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> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
<Sha>796d2f8b516781d64bbdf4c21b0163de9fa56ab8</Sha> <Sha>5f5283806774a7fd1bbe2ec54736dc8a5d30c16d</Sha>
</Dependency> </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> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
<Sha>796d2f8b516781d64bbdf4c21b0163de9fa56ab8</Sha> <Sha>5f5283806774a7fd1bbe2ec54736dc8a5d30c16d</Sha>
</Dependency> </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> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
<Sha>796d2f8b516781d64bbdf4c21b0163de9fa56ab8</Sha> <Sha>5f5283806774a7fd1bbe2ec54736dc8a5d30c16d</Sha>
</Dependency> </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> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
<Sha>796d2f8b516781d64bbdf4c21b0163de9fa56ab8</Sha> <Sha>5f5283806774a7fd1bbe2ec54736dc8a5d30c16d</Sha>
</Dependency> </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> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
<Sha>796d2f8b516781d64bbdf4c21b0163de9fa56ab8</Sha> <Sha>5f5283806774a7fd1bbe2ec54736dc8a5d30c16d</Sha>
</Dependency> </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> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
<Sha>796d2f8b516781d64bbdf4c21b0163de9fa56ab8</Sha> <Sha>5f5283806774a7fd1bbe2ec54736dc8a5d30c16d</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.Extensions.Caching.Abstractions" Version="6.0.0"> <Dependency Name="Microsoft.Extensions.Caching.Abstractions" Version="6.0.0">
<Uri>https://github.com/dotnet/runtime</Uri> <Uri>https://github.com/dotnet/runtime</Uri>
...@@ -177,9 +177,9 @@ ...@@ -177,9 +177,9 @@
<Uri>https://github.com/dotnet/runtime</Uri> <Uri>https://github.com/dotnet/runtime</Uri>
<Sha>4822e3c3aa77eb82b2fb33c9321f923cf11ddde6</Sha> <Sha>4822e3c3aa77eb82b2fb33c9321f923cf11ddde6</Sha>
</Dependency> </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> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>7cca709db2944a09b4db6ca7b20c457ff260fb5a</Sha> <Sha>0ec02c8c96e2eda06dc5b5edfdbdba0f36415082</Sha>
</Dependency> </Dependency>
<Dependency Name="System.Diagnostics.DiagnosticSource" Version="6.0.0"> <Dependency Name="System.Diagnostics.DiagnosticSource" Version="6.0.0">
<Uri>https://github.com/dotnet/runtime</Uri> <Uri>https://github.com/dotnet/runtime</Uri>
...@@ -245,40 +245,40 @@ ...@@ -245,40 +245,40 @@
<Uri>https://github.com/dotnet/runtime</Uri> <Uri>https://github.com/dotnet/runtime</Uri>
<Sha>4822e3c3aa77eb82b2fb33c9321f923cf11ddde6</Sha> <Sha>4822e3c3aa77eb82b2fb33c9321f923cf11ddde6</Sha>
</Dependency> </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> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>7cca709db2944a09b4db6ca7b20c457ff260fb5a</Sha> <Sha>0ec02c8c96e2eda06dc5b5edfdbdba0f36415082</Sha>
</Dependency> </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> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>7cca709db2944a09b4db6ca7b20c457ff260fb5a</Sha> <Sha>0ec02c8c96e2eda06dc5b5edfdbdba0f36415082</Sha>
</Dependency> </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> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>7cca709db2944a09b4db6ca7b20c457ff260fb5a</Sha> <Sha>0ec02c8c96e2eda06dc5b5edfdbdba0f36415082</Sha>
</Dependency> </Dependency>
<!-- <!--
Win-x64 is used here because we have picked an arbitrary runtime identifier to flow the version of the latest NETCore.App runtime. 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. 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> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>7cca709db2944a09b4db6ca7b20c457ff260fb5a</Sha> <Sha>0ec02c8c96e2eda06dc5b5edfdbdba0f36415082</Sha>
</Dependency> </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> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>7cca709db2944a09b4db6ca7b20c457ff260fb5a</Sha> <Sha>0ec02c8c96e2eda06dc5b5edfdbdba0f36415082</Sha>
</Dependency> </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> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>7cca709db2944a09b4db6ca7b20c457ff260fb5a</Sha> <Sha>0ec02c8c96e2eda06dc5b5edfdbdba0f36415082</Sha>
</Dependency> </Dependency>
</ProductDependencies> </ProductDependencies>
<ToolsetDependencies> <ToolsetDependencies>
<!-- Listed explicitly to workaround https://github.com/dotnet/cli/issues/10528 --> <!-- 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> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>7cca709db2944a09b4db6ca7b20c457ff260fb5a</Sha> <Sha>0ec02c8c96e2eda06dc5b5edfdbdba0f36415082</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.22314.7"> <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.22314.7">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
......
eng/Versions.props
+ 18
− 18
浏览文件 @ ec68a6b2
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
<AspNetCoreMajorVersion>6</AspNetCoreMajorVersion> <AspNetCoreMajorVersion>6</AspNetCoreMajorVersion>
<AspNetCoreMinorVersion>0</AspNetCoreMinorVersion> <AspNetCoreMinorVersion>0</AspNetCoreMinorVersion>
<AspNetCorePatchVersion>8</AspNetCorePatchVersion> <AspNetCorePatchVersion>8</AspNetCorePatchVersion>
<ValidateBaseline>false</ValidateBaseline> <ValidateBaseline>true</ValidateBaseline>
<!-- <!--
When StabilizePackageVersion is set to 'true', this branch will produce stable outputs for 'Shipping' packages When StabilizePackageVersion is set to 'true', this branch will produce stable outputs for 'Shipping' packages
--> -->
...@@ -63,12 +63,12 @@ ...@@ -63,12 +63,12 @@
<PropertyGroup Label="Automated"> <PropertyGroup Label="Automated">
<!-- Packages from dotnet/runtime --> <!-- Packages from dotnet/runtime -->
<MicrosoftExtensionsDependencyModelVersion>6.0.0</MicrosoftExtensionsDependencyModelVersion> <MicrosoftExtensionsDependencyModelVersion>6.0.0</MicrosoftExtensionsDependencyModelVersion>
<MicrosoftNETCoreAppRefVersion>6.0.6</MicrosoftNETCoreAppRefVersion> <MicrosoftNETCoreAppRefVersion>6.0.7</MicrosoftNETCoreAppRefVersion>
<MicrosoftNETCoreAppRuntimewinx64Version>6.0.6</MicrosoftNETCoreAppRuntimewinx64Version> <MicrosoftNETCoreAppRuntimewinx64Version>6.0.7</MicrosoftNETCoreAppRuntimewinx64Version>
<MicrosoftNETRuntimeMonoAOTCompilerTaskVersion>6.0.6</MicrosoftNETRuntimeMonoAOTCompilerTaskVersion> <MicrosoftNETRuntimeMonoAOTCompilerTaskVersion>6.0.7</MicrosoftNETRuntimeMonoAOTCompilerTaskVersion>
<MicrosoftNETRuntimeWebAssemblySdkVersion>6.0.6</MicrosoftNETRuntimeWebAssemblySdkVersion> <MicrosoftNETRuntimeWebAssemblySdkVersion>6.0.7</MicrosoftNETRuntimeWebAssemblySdkVersion>
<MicrosoftNETCoreAppRuntimeAOTwinx64CrossbrowserwasmVersion>6.0.6</MicrosoftNETCoreAppRuntimeAOTwinx64CrossbrowserwasmVersion> <MicrosoftNETCoreAppRuntimeAOTwinx64CrossbrowserwasmVersion>6.0.7</MicrosoftNETCoreAppRuntimeAOTwinx64CrossbrowserwasmVersion>
<MicrosoftNETCoreBrowserDebugHostTransportVersion>6.0.6-servicing.22267.7</MicrosoftNETCoreBrowserDebugHostTransportVersion> <MicrosoftNETCoreBrowserDebugHostTransportVersion>6.0.7-servicing.22322.2</MicrosoftNETCoreBrowserDebugHostTransportVersion>
<MicrosoftExtensionsCachingAbstractionsVersion>6.0.0</MicrosoftExtensionsCachingAbstractionsVersion> <MicrosoftExtensionsCachingAbstractionsVersion>6.0.0</MicrosoftExtensionsCachingAbstractionsVersion>
<MicrosoftExtensionsCachingMemoryVersion>6.0.1</MicrosoftExtensionsCachingMemoryVersion> <MicrosoftExtensionsCachingMemoryVersion>6.0.1</MicrosoftExtensionsCachingMemoryVersion>
<MicrosoftExtensionsConfigurationAbstractionsVersion>6.0.0</MicrosoftExtensionsConfigurationAbstractionsVersion> <MicrosoftExtensionsConfigurationAbstractionsVersion>6.0.0</MicrosoftExtensionsConfigurationAbstractionsVersion>
...@@ -103,7 +103,7 @@ ...@@ -103,7 +103,7 @@
<MicrosoftExtensionsOptionsDataAnnotationsVersion>6.0.0</MicrosoftExtensionsOptionsDataAnnotationsVersion> <MicrosoftExtensionsOptionsDataAnnotationsVersion>6.0.0</MicrosoftExtensionsOptionsDataAnnotationsVersion>
<MicrosoftExtensionsOptionsVersion>6.0.0</MicrosoftExtensionsOptionsVersion> <MicrosoftExtensionsOptionsVersion>6.0.0</MicrosoftExtensionsOptionsVersion>
<MicrosoftExtensionsPrimitivesVersion>6.0.0</MicrosoftExtensionsPrimitivesVersion> <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> <SystemDiagnosticsDiagnosticSourceVersion>6.0.0</SystemDiagnosticsDiagnosticSourceVersion>
<SystemDiagnosticsEventLogVersion>6.0.0</SystemDiagnosticsEventLogVersion> <SystemDiagnosticsEventLogVersion>6.0.0</SystemDiagnosticsEventLogVersion>
<SystemDirectoryServicesProtocolsVersion>6.0.1</SystemDirectoryServicesProtocolsVersion> <SystemDirectoryServicesProtocolsVersion>6.0.1</SystemDirectoryServicesProtocolsVersion>
...@@ -120,16 +120,16 @@ ...@@ -120,16 +120,16 @@
<SystemTextJsonVersion>6.0.5</SystemTextJsonVersion> <SystemTextJsonVersion>6.0.5</SystemTextJsonVersion>
<SystemThreadingChannelsVersion>6.0.0</SystemThreadingChannelsVersion> <SystemThreadingChannelsVersion>6.0.0</SystemThreadingChannelsVersion>
<!-- Only listed explicitly to workaround https://github.com/dotnet/cli/issues/10528 --> <!-- 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 --> <!-- Packages from dotnet/efcore -->
<dotnetefVersion>6.0.6</dotnetefVersion> <dotnetefVersion>6.0.7</dotnetefVersion>
<MicrosoftEntityFrameworkCoreInMemoryVersion>6.0.6</MicrosoftEntityFrameworkCoreInMemoryVersion> <MicrosoftEntityFrameworkCoreInMemoryVersion>6.0.7</MicrosoftEntityFrameworkCoreInMemoryVersion>
<MicrosoftEntityFrameworkCoreRelationalVersion>6.0.6</MicrosoftEntityFrameworkCoreRelationalVersion> <MicrosoftEntityFrameworkCoreRelationalVersion>6.0.7</MicrosoftEntityFrameworkCoreRelationalVersion>
<MicrosoftEntityFrameworkCoreSqliteVersion>6.0.6</MicrosoftEntityFrameworkCoreSqliteVersion> <MicrosoftEntityFrameworkCoreSqliteVersion>6.0.7</MicrosoftEntityFrameworkCoreSqliteVersion>
<MicrosoftEntityFrameworkCoreSqlServerVersion>6.0.6</MicrosoftEntityFrameworkCoreSqlServerVersion> <MicrosoftEntityFrameworkCoreSqlServerVersion>6.0.7</MicrosoftEntityFrameworkCoreSqlServerVersion>
<MicrosoftEntityFrameworkCoreToolsVersion>6.0.6</MicrosoftEntityFrameworkCoreToolsVersion> <MicrosoftEntityFrameworkCoreToolsVersion>6.0.7</MicrosoftEntityFrameworkCoreToolsVersion>
<MicrosoftEntityFrameworkCoreVersion>6.0.6</MicrosoftEntityFrameworkCoreVersion> <MicrosoftEntityFrameworkCoreVersion>6.0.7</MicrosoftEntityFrameworkCoreVersion>
<MicrosoftEntityFrameworkCoreDesignVersion>6.0.6</MicrosoftEntityFrameworkCoreDesignVersion> <MicrosoftEntityFrameworkCoreDesignVersion>6.0.7</MicrosoftEntityFrameworkCoreDesignVersion>
<!-- Packages from dotnet/arcade --> <!-- Packages from dotnet/arcade -->
<MicrosoftDotNetBuildTasksInstallersVersion>6.0.0-beta.22314.7</MicrosoftDotNetBuildTasksInstallersVersion> <MicrosoftDotNetBuildTasksInstallersVersion>6.0.0-beta.22314.7</MicrosoftDotNetBuildTasksInstallersVersion>
<MicrosoftDotNetBuildTasksTemplatingVersion>6.0.0-beta.22314.7</MicrosoftDotNetBuildTasksTemplatingVersion> <MicrosoftDotNetBuildTasksTemplatingVersion>6.0.0-beta.22314.7</MicrosoftDotNetBuildTasksTemplatingVersion>
...@@ -214,7 +214,7 @@ ...@@ -214,7 +214,7 @@
<!-- Packages from 2.1, 3.1, and 5.0 branches used for site extension build. --> <!-- Packages from 2.1, 3.1, and 5.0 branches used for site extension build. -->
<MicrosoftAspNetCoreAzureAppServicesSiteExtension21Version>2.1.1</MicrosoftAspNetCoreAzureAppServicesSiteExtension21Version> <MicrosoftAspNetCoreAzureAppServicesSiteExtension21Version>2.1.1</MicrosoftAspNetCoreAzureAppServicesSiteExtension21Version>
<MicrosoftAspNetCoreAzureAppServicesSiteExtension22Version>2.2.0</MicrosoftAspNetCoreAzureAppServicesSiteExtension22Version> <MicrosoftAspNetCoreAzureAppServicesSiteExtension22Version>2.2.0</MicrosoftAspNetCoreAzureAppServicesSiteExtension22Version>
<MicrosoftAspNetCoreAzureAppServicesSiteExtension31Version>3.1.26-servicing-22274-3</MicrosoftAspNetCoreAzureAppServicesSiteExtension31Version> <MicrosoftAspNetCoreAzureAppServicesSiteExtension31Version>3.1.27-servicing-22316-11</MicrosoftAspNetCoreAzureAppServicesSiteExtension31Version>
<MicrosoftAspNetCoreAzureAppServicesSiteExtension31x64Version>$(MicrosoftAspNetCoreAzureAppServicesSiteExtension31Version)</MicrosoftAspNetCoreAzureAppServicesSiteExtension31x64Version> <MicrosoftAspNetCoreAzureAppServicesSiteExtension31x64Version>$(MicrosoftAspNetCoreAzureAppServicesSiteExtension31Version)</MicrosoftAspNetCoreAzureAppServicesSiteExtension31x64Version>
<MicrosoftAspNetCoreAzureAppServicesSiteExtension31x86Version>$(MicrosoftAspNetCoreAzureAppServicesSiteExtension31Version)</MicrosoftAspNetCoreAzureAppServicesSiteExtension31x86Version> <MicrosoftAspNetCoreAzureAppServicesSiteExtension31x86Version>$(MicrosoftAspNetCoreAzureAppServicesSiteExtension31Version)</MicrosoftAspNetCoreAzureAppServicesSiteExtension31x86Version>
<MicrosoftAspNetCoreAzureAppServicesSiteExtension50Version>5.0.17-servicing-22215-7</MicrosoftAspNetCoreAzureAppServicesSiteExtension50Version> <MicrosoftAspNetCoreAzureAppServicesSiteExtension50Version>5.0.17-servicing-22215-7</MicrosoftAspNetCoreAzureAppServicesSiteExtension50Version>
......
global.json
+ 3
− 3
浏览文件 @ ec68a6b2
{ {
"sdk": { "sdk": {
"version": "6.0.106" "version": "6.0.107"
}, },
"tools": { "tools": {
"dotnet": "6.0.106", "dotnet": "6.0.107",
"runtimes": { "runtimes": {
"dotnet/x64": [ "dotnet/x64": [
"2.1.30", "2.1.30",
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
"$(MicrosoftNETCoreBrowserDebugHostTransportVersion)" "$(MicrosoftNETCoreBrowserDebugHostTransportVersion)"
], ],
"aspnetcore/x64": [ "aspnetcore/x64": [
"3.1.26" "3.1.27"
] ]
}, },
"Git": "2.22.0", "Git": "2.22.0",
......
src/Servers/IIS/IIS/test/Common.FunctionalTests/StartupTests.cs
+ 1
− 1
浏览文件 @ ec68a6b2
...@@ -426,7 +426,7 @@ namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests ...@@ -426,7 +426,7 @@ namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests
Assert.Equal(HttpStatusCode.InternalServerError, response.StatusCode); Assert.Equal(HttpStatusCode.InternalServerError, response.StatusCode);
var responseContent = await response.Content.ReadAsStringAsync(); var responseContent = await response.Content.ReadAsStringAsync();
Assert.Contains("500.31", responseContent); 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 else
{ {
......
src/Servers/IIS/IIS/test/IIS.Shared.FunctionalTests/StdOutRedirectionTests.cs
+ 9
− 4
浏览文件 @ ec68a6b2
...@@ -47,7 +47,9 @@ namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests ...@@ -47,7 +47,9 @@ namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests
StopServer(); StopServer();
EventLogHelpers.VerifyEventLogEvent(deploymentResult, 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] [ConditionalFact]
...@@ -69,10 +71,13 @@ namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests ...@@ -69,10 +71,13 @@ namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests
StopServer(); StopServer();
var contents = Helpers.ReadAllTextFromFile(Helpers.GetExpectedLogName(deploymentResult, LogFolderPath), Logger); 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, EventLogHelpers.VerifyEventLogEvent(deploymentResult,
@"The framework 'Microsoft.NETCore.App', version '2.9.9' \(x64\) was not found.", Logger); missingFrameworkString, Logger);
Assert.Contains(expectedString, contents); Assert.Contains(@"Framework: 'Microsoft.NETCore.App', version '2.9.9' (x64)", contents);
Assert.Contains(missingFrameworkString, contents);
} }
[ConditionalFact] [ConditionalFact]
......
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或