diff options
author | Sean Reeser <v-seanreeser@microsoft.com> | 2022-11-08 21:49:32 +0300 |
---|---|---|
committer | Sean Reeser <v-seanreeser@microsoft.com> | 2022-11-08 21:49:32 +0300 |
commit | b145d32b05c131326298faf80ede8c6eb4ba37fc (patch) | |
tree | 963d3e7d09a44e15f3eaabfc473d89ac1d1598d1 | |
parent | 93aed39189bc617ee13a979abd708f65630ed871 (diff) | |
parent | 617d594f2bf75a8904d3d0e7d68a0bacf8e6763a (diff) |
Merge commit '617d594f2bf75a8904d3d0e7d68a0bacf8e6763a' into internal-merge-6.0-2022-11-08-1049
-rw-r--r-- | NuGet.config | 8 | ||||
-rw-r--r-- | eng/Version.Details.xml | 72 | ||||
-rw-r--r-- | eng/Versions.props | 36 |
3 files changed, 62 insertions, 54 deletions
diff --git a/NuGet.config b/NuGet.config index 4b821f8009..0f0199f158 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,8 +4,12 @@ <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-943474c" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-943474ca/nuget/v3/index.json" /> <!-- End: Package sources from dotnet-runtime --> <!-- Begin: Package sources from dotnet-efcore --> + <add key="darc-int-dotnet-efcore-41de762" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-efcore-41de7629/nuget/v3/index.json" /> + <add key="darc-int-dotnet-efcore-41de762-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-efcore-41de7629-2/nuget/v3/index.json" /> + <add key="darc-int-dotnet-efcore-41de762-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-efcore-41de7629-1/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 +29,12 @@ <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-41de762-1" value="true" /> + <add key="darc-int-dotnet-efcore-41de762-2" value="true" /> + <add key="darc-int-dotnet-efcore-41de762" value="true" /> <!-- End: Package sources from dotnet-efcore --> <!-- Begin: Package sources from dotnet-runtime --> + <add key="darc-int-dotnet-runtime-943474c" 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 b39c303f07..811b76ee27 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,37 +9,37 @@ --> <Dependencies> <ProductDependencies> - <Dependency Name="dotnet-ef" Version="6.0.10"> + <Dependency Name="dotnet-ef" Version="6.0.11"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri> - <Sha>f7333f1afa250ed33d3db52f0b531910b23a55b2</Sha> + <Sha>41de76292bf32718493a641fff49252c68fdbe53</Sha> </Dependency> - <Dependency Name="Microsoft.EntityFrameworkCore.InMemory" Version="6.0.10"> + <Dependency Name="Microsoft.EntityFrameworkCore.InMemory" Version="6.0.11"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri> - <Sha>f7333f1afa250ed33d3db52f0b531910b23a55b2</Sha> + <Sha>41de76292bf32718493a641fff49252c68fdbe53</Sha> </Dependency> - <Dependency Name="Microsoft.EntityFrameworkCore.Relational" Version="6.0.10"> + <Dependency Name="Microsoft.EntityFrameworkCore.Relational" Version="6.0.11"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri> - <Sha>f7333f1afa250ed33d3db52f0b531910b23a55b2</Sha> + <Sha>41de76292bf32718493a641fff49252c68fdbe53</Sha> </Dependency> - <Dependency Name="Microsoft.EntityFrameworkCore.Sqlite" Version="6.0.10"> + <Dependency Name="Microsoft.EntityFrameworkCore.Sqlite" Version="6.0.11"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri> - <Sha>f7333f1afa250ed33d3db52f0b531910b23a55b2</Sha> + <Sha>41de76292bf32718493a641fff49252c68fdbe53</Sha> </Dependency> - <Dependency Name="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.10"> + <Dependency Name="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.11"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri> - <Sha>f7333f1afa250ed33d3db52f0b531910b23a55b2</Sha> + <Sha>41de76292bf32718493a641fff49252c68fdbe53</Sha> </Dependency> - <Dependency Name="Microsoft.EntityFrameworkCore.Tools" Version="6.0.10"> + <Dependency Name="Microsoft.EntityFrameworkCore.Tools" Version="6.0.11"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri> - <Sha>f7333f1afa250ed33d3db52f0b531910b23a55b2</Sha> + <Sha>41de76292bf32718493a641fff49252c68fdbe53</Sha> </Dependency> - <Dependency Name="Microsoft.EntityFrameworkCore" Version="6.0.10"> + <Dependency Name="Microsoft.EntityFrameworkCore" Version="6.0.11"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri> - <Sha>f7333f1afa250ed33d3db52f0b531910b23a55b2</Sha> + <Sha>41de76292bf32718493a641fff49252c68fdbe53</Sha> </Dependency> - <Dependency Name="Microsoft.EntityFrameworkCore.Design" Version="6.0.10"> + <Dependency Name="Microsoft.EntityFrameworkCore.Design" Version="6.0.11"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri> - <Sha>f7333f1afa250ed33d3db52f0b531910b23a55b2</Sha> + <Sha>41de76292bf32718493a641fff49252c68fdbe53</Sha> </Dependency> <Dependency Name="Microsoft.Extensions.Caching.Abstractions" Version="6.0.0"> <Uri>https://github.com/dotnet/runtime</Uri> @@ -129,9 +129,9 @@ <Uri>https://github.com/dotnet/runtime</Uri> <Sha>4822e3c3aa77eb82b2fb33c9321f923cf11ddde6</Sha> </Dependency> - <Dependency Name="Microsoft.Extensions.Logging.Abstractions" Version="6.0.2"> + <Dependency Name="Microsoft.Extensions.Logging.Abstractions" Version="6.0.3"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> - <Sha>163a63591cf9e9b682063cf3995948c2b885a042</Sha> + <Sha>943474ca16db7c65ba6cff4a89c3ebd219dde3e5</Sha> </Dependency> <Dependency Name="Microsoft.Extensions.Logging.Configuration" 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.10-servicing.22476.5"> + <Dependency Name="Microsoft.Internal.Runtime.AspNetCore.Transport" Version="6.0.11-servicing.22523.4"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> - <Sha>5a400c212afdf8e675c9a1d38442e6d2f19f7b74</Sha> + <Sha>943474ca16db7c65ba6cff4a89c3ebd219dde3e5</Sha> </Dependency> <Dependency Name="System.Diagnostics.DiagnosticSource" Version="6.0.0"> <Uri>https://github.com/dotnet/runtime</Uri> @@ -233,9 +233,9 @@ <Uri>https://github.com/dotnet/runtime</Uri> <Sha>4822e3c3aa77eb82b2fb33c9321f923cf11ddde6</Sha> </Dependency> - <Dependency Name="System.Text.Json" Version="6.0.6"> + <Dependency Name="System.Text.Json" Version="6.0.7"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> - <Sha>163a63591cf9e9b682063cf3995948c2b885a042</Sha> + <Sha>943474ca16db7c65ba6cff4a89c3ebd219dde3e5</Sha> </Dependency> <Dependency Name="System.Threading.Channels" 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.10"> + <Dependency Name="Microsoft.NETCore.App.Ref" Version="6.0.11"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> - <Sha>5a400c212afdf8e675c9a1d38442e6d2f19f7b74</Sha> + <Sha>943474ca16db7c65ba6cff4a89c3ebd219dde3e5</Sha> </Dependency> - <Dependency Name="Microsoft.NET.Runtime.MonoAOTCompiler.Task" Version="6.0.10"> + <Dependency Name="Microsoft.NET.Runtime.MonoAOTCompiler.Task" Version="6.0.11"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> - <Sha>5a400c212afdf8e675c9a1d38442e6d2f19f7b74</Sha> + <Sha>943474ca16db7c65ba6cff4a89c3ebd219dde3e5</Sha> </Dependency> - <Dependency Name="Microsoft.NET.Runtime.WebAssembly.Sdk" Version="6.0.10"> + <Dependency Name="Microsoft.NET.Runtime.WebAssembly.Sdk" Version="6.0.11"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> - <Sha>5a400c212afdf8e675c9a1d38442e6d2f19f7b74</Sha> + <Sha>943474ca16db7c65ba6cff4a89c3ebd219dde3e5</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.10"> + <Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="6.0.11"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> - <Sha>5a400c212afdf8e675c9a1d38442e6d2f19f7b74</Sha> + <Sha>943474ca16db7c65ba6cff4a89c3ebd219dde3e5</Sha> </Dependency> - <Dependency Name="Microsoft.NETCore.App.Runtime.AOT.win-x64.Cross.browser-wasm" Version="6.0.10"> + <Dependency Name="Microsoft.NETCore.App.Runtime.AOT.win-x64.Cross.browser-wasm" Version="6.0.11"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> - <Sha>5a400c212afdf8e675c9a1d38442e6d2f19f7b74</Sha> + <Sha>943474ca16db7c65ba6cff4a89c3ebd219dde3e5</Sha> </Dependency> - <Dependency Name="Microsoft.NETCore.BrowserDebugHost.Transport" Version="6.0.10-servicing.22476.5"> + <Dependency Name="Microsoft.NETCore.BrowserDebugHost.Transport" Version="6.0.11-servicing.22523.4"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> - <Sha>5a400c212afdf8e675c9a1d38442e6d2f19f7b74</Sha> + <Sha>943474ca16db7c65ba6cff4a89c3ebd219dde3e5</Sha> </Dependency> </ProductDependencies> <ToolsetDependencies> <!-- Listed explicitly to workaround https://github.com/dotnet/cli/issues/10528 --> - <Dependency Name="Microsoft.NETCore.Platforms" Version="6.0.6"> + <Dependency Name="Microsoft.NETCore.Platforms" Version="6.0.7"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> - <Sha>5a400c212afdf8e675c9a1d38442e6d2f19f7b74</Sha> + <Sha>943474ca16db7c65ba6cff4a89c3ebd219dde3e5</Sha> </Dependency> <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.22512.3"> <Uri>https://github.com/dotnet/arcade</Uri> diff --git a/eng/Versions.props b/eng/Versions.props index 062929ce8f..0708296190 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.10</MicrosoftNETCoreAppRefVersion> - <MicrosoftNETCoreAppRuntimewinx64Version>6.0.10</MicrosoftNETCoreAppRuntimewinx64Version> - <MicrosoftNETRuntimeMonoAOTCompilerTaskVersion>6.0.10</MicrosoftNETRuntimeMonoAOTCompilerTaskVersion> - <MicrosoftNETRuntimeWebAssemblySdkVersion>6.0.10</MicrosoftNETRuntimeWebAssemblySdkVersion> - <MicrosoftNETCoreAppRuntimeAOTwinx64CrossbrowserwasmVersion>6.0.10</MicrosoftNETCoreAppRuntimeAOTwinx64CrossbrowserwasmVersion> - <MicrosoftNETCoreBrowserDebugHostTransportVersion>6.0.10-servicing.22476.5</MicrosoftNETCoreBrowserDebugHostTransportVersion> + <MicrosoftNETCoreAppRefVersion>6.0.11</MicrosoftNETCoreAppRefVersion> + <MicrosoftNETCoreAppRuntimewinx64Version>6.0.11</MicrosoftNETCoreAppRuntimewinx64Version> + <MicrosoftNETRuntimeMonoAOTCompilerTaskVersion>6.0.11</MicrosoftNETRuntimeMonoAOTCompilerTaskVersion> + <MicrosoftNETRuntimeWebAssemblySdkVersion>6.0.11</MicrosoftNETRuntimeWebAssemblySdkVersion> + <MicrosoftNETCoreAppRuntimeAOTwinx64CrossbrowserwasmVersion>6.0.11</MicrosoftNETCoreAppRuntimeAOTwinx64CrossbrowserwasmVersion> + <MicrosoftNETCoreBrowserDebugHostTransportVersion>6.0.11-servicing.22523.4</MicrosoftNETCoreBrowserDebugHostTransportVersion> <MicrosoftExtensionsCachingAbstractionsVersion>6.0.0</MicrosoftExtensionsCachingAbstractionsVersion> <MicrosoftExtensionsCachingMemoryVersion>6.0.1</MicrosoftExtensionsCachingMemoryVersion> <MicrosoftExtensionsConfigurationAbstractionsVersion>6.0.0</MicrosoftExtensionsConfigurationAbstractionsVersion> @@ -91,7 +91,7 @@ <MicrosoftExtensionsHostingAbstractionsVersion>6.0.0</MicrosoftExtensionsHostingAbstractionsVersion> <MicrosoftExtensionsHostingVersion>6.0.1</MicrosoftExtensionsHostingVersion> <MicrosoftExtensionsHttpVersion>6.0.0</MicrosoftExtensionsHttpVersion> - <MicrosoftExtensionsLoggingAbstractionsVersion>6.0.2</MicrosoftExtensionsLoggingAbstractionsVersion> + <MicrosoftExtensionsLoggingAbstractionsVersion>6.0.3</MicrosoftExtensionsLoggingAbstractionsVersion> <MicrosoftExtensionsLoggingConfigurationVersion>6.0.0</MicrosoftExtensionsLoggingConfigurationVersion> <MicrosoftExtensionsLoggingConsoleVersion>6.0.0</MicrosoftExtensionsLoggingConsoleVersion> <MicrosoftExtensionsLoggingDebugVersion>6.0.0</MicrosoftExtensionsLoggingDebugVersion> @@ -103,7 +103,7 @@ <MicrosoftExtensionsOptionsDataAnnotationsVersion>6.0.0</MicrosoftExtensionsOptionsDataAnnotationsVersion> <MicrosoftExtensionsOptionsVersion>6.0.0</MicrosoftExtensionsOptionsVersion> <MicrosoftExtensionsPrimitivesVersion>6.0.0</MicrosoftExtensionsPrimitivesVersion> - <MicrosoftInternalRuntimeAspNetCoreTransportVersion>6.0.10-servicing.22476.5</MicrosoftInternalRuntimeAspNetCoreTransportVersion> + <MicrosoftInternalRuntimeAspNetCoreTransportVersion>6.0.11-servicing.22523.4</MicrosoftInternalRuntimeAspNetCoreTransportVersion> <SystemDiagnosticsDiagnosticSourceVersion>6.0.0</SystemDiagnosticsDiagnosticSourceVersion> <SystemDiagnosticsEventLogVersion>6.0.0</SystemDiagnosticsEventLogVersion> <SystemDirectoryServicesProtocolsVersion>6.0.1</SystemDirectoryServicesProtocolsVersion> @@ -117,19 +117,19 @@ <SystemSecurityCryptographyXmlVersion>6.0.1</SystemSecurityCryptographyXmlVersion> <SystemServiceProcessServiceControllerVersion>6.0.0</SystemServiceProcessServiceControllerVersion> <SystemTextEncodingsWebVersion>6.0.0</SystemTextEncodingsWebVersion> - <SystemTextJsonVersion>6.0.6</SystemTextJsonVersion> + <SystemTextJsonVersion>6.0.7</SystemTextJsonVersion> <SystemThreadingChannelsVersion>6.0.0</SystemThreadingChannelsVersion> <!-- Only listed explicitly to workaround https://github.com/dotnet/cli/issues/10528 --> - <MicrosoftNETCorePlatformsVersion>6.0.6</MicrosoftNETCorePlatformsVersion> + <MicrosoftNETCorePlatformsVersion>6.0.7</MicrosoftNETCorePlatformsVersion> <!-- Packages from dotnet/efcore --> - <dotnetefVersion>6.0.10</dotnetefVersion> - <MicrosoftEntityFrameworkCoreInMemoryVersion>6.0.10</MicrosoftEntityFrameworkCoreInMemoryVersion> - <MicrosoftEntityFrameworkCoreRelationalVersion>6.0.10</MicrosoftEntityFrameworkCoreRelationalVersion> - <MicrosoftEntityFrameworkCoreSqliteVersion>6.0.10</MicrosoftEntityFrameworkCoreSqliteVersion> - <MicrosoftEntityFrameworkCoreSqlServerVersion>6.0.10</MicrosoftEntityFrameworkCoreSqlServerVersion> - <MicrosoftEntityFrameworkCoreToolsVersion>6.0.10</MicrosoftEntityFrameworkCoreToolsVersion> - <MicrosoftEntityFrameworkCoreVersion>6.0.10</MicrosoftEntityFrameworkCoreVersion> - <MicrosoftEntityFrameworkCoreDesignVersion>6.0.10</MicrosoftEntityFrameworkCoreDesignVersion> + <dotnetefVersion>6.0.11</dotnetefVersion> + <MicrosoftEntityFrameworkCoreInMemoryVersion>6.0.11</MicrosoftEntityFrameworkCoreInMemoryVersion> + <MicrosoftEntityFrameworkCoreRelationalVersion>6.0.11</MicrosoftEntityFrameworkCoreRelationalVersion> + <MicrosoftEntityFrameworkCoreSqliteVersion>6.0.11</MicrosoftEntityFrameworkCoreSqliteVersion> + <MicrosoftEntityFrameworkCoreSqlServerVersion>6.0.11</MicrosoftEntityFrameworkCoreSqlServerVersion> + <MicrosoftEntityFrameworkCoreToolsVersion>6.0.11</MicrosoftEntityFrameworkCoreToolsVersion> + <MicrosoftEntityFrameworkCoreVersion>6.0.11</MicrosoftEntityFrameworkCoreVersion> + <MicrosoftEntityFrameworkCoreDesignVersion>6.0.11</MicrosoftEntityFrameworkCoreDesignVersion> <!-- Packages from dotnet/arcade --> <MicrosoftDotNetBuildTasksInstallersVersion>6.0.0-beta.22512.3</MicrosoftDotNetBuildTasksInstallersVersion> <MicrosoftDotNetBuildTasksTemplatingVersion>6.0.0-beta.22512.3</MicrosoftDotNetBuildTasksTemplatingVersion> |