From a9a2ed7803d91edbec7d6115258b65cab880dece Mon Sep 17 00:00:00 2001 From: DotNet-Bot <dn-bot@microsoft.com> Date: Tue, 21 Nov 2023 15:32:16 +0000 Subject: [PATCH] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231121.5 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.101 -> To Version 8.0.101 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.NET.ILLink.Tasks,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.SourceBuild.Intermediate.emsdk From Version 8.0.0 -> To Version 8.0.1 (parent: Microsoft.NET.Sdk --- NuGet.config | 8 ++++---- eng/Version.Details.xml | 38 +++++++++++++++++++------------------- eng/Versions.props | 14 +++++++------- 3 files changed, 30 insertions(+), 30 deletions(-) diff --git a/NuGet.config b/NuGet.config index cd0c3e9c4..bfe05ac58 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,7 +10,7 @@ <add key="darc-pub-dotnet-emsdk-d75f77c" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-d75f77cb/nuget/v3/index.json" /> <!-- End: Package sources from dotnet-emsdk --> <!-- Begin: Package sources from dotnet-aspnetcore --> - <add key="darc-int-dotnet-aspnetcore-7093428" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-70934289/nuget/v3/index.json" /> + <add key="darc-int-dotnet-aspnetcore-6f3114f" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-6f3114fd/nuget/v3/index.json" /> <!-- End: Package sources from dotnet-aspnetcore --> <!-- Begin: Package sources from DotNet-msbuild-Trusted --> <!-- End: Package sources from DotNet-msbuild-Trusted --> @@ -18,7 +18,7 @@ <add key="darc-int-dotnet-runtime-f83afe4" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-f83afe4e/nuget/v3/index.json" /> <!-- End: Package sources from dotnet-runtime --> <!-- Begin: Package sources from dotnet-sdk --> - <add key="darc-int-dotnet-sdk-c793265" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-c7932657/nuget/v3/index.json" /> + <add key="darc-int-dotnet-sdk-ddf9111" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-ddf91112/nuget/v3/index.json" /> <!-- End: Package sources from dotnet-sdk --> <!-- Begin: Package sources from dotnet-windowsdesktop --> <add key="darc-int-dotnet-windowsdesktop-beb23ef" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-beb23efb/nuget/v3/index.json" /> @@ -42,12 +42,12 @@ <disabledPackageSources> <!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.--> <!-- Begin: Package sources from dotnet-aspnetcore --> - <add key="darc-int-dotnet-aspnetcore-7093428" value="true" /> + <add key="darc-int-dotnet-aspnetcore-6f3114f" value="true" /> <!-- End: Package sources from dotnet-aspnetcore --> <!-- Begin: Package sources from dotnet-runtime --> <add key="darc-int-dotnet-runtime-f83afe4" value="true" /> <!-- Begin: Package sources from dotnet-sdk --> - <add key="darc-int-dotnet-sdk-c793265" value="true" /> + <add key="darc-int-dotnet-sdk-ddf9111" value="true" /> <!-- End: Package sources from dotnet-sdk --> <!-- Begin: Package sources from dotnet-windowsdesktop --> <add key="darc-int-dotnet-windowsdesktop-beb23ef" value="true" /> diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1cac67efb..c6196825f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -58,49 +58,49 @@ </Dependency> <Dependency Name="Microsoft.AspNetCore.App.Ref" Version="8.0.1" CoherentParentDependency="Microsoft.NET.Sdk"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri> - <Sha>709342899e770ba4ab6e674fc5d5d6d90ce67b73</Sha> + <Sha>6f3114fd9c67c64ce1d35ddbdc8450fa465e216d</Sha> </Dependency> - <Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="8.0.1-servicing.23569.3" CoherentParentDependency="Microsoft.NET.Sdk"> + <Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="8.0.1-servicing.23571.2" CoherentParentDependency="Microsoft.NET.Sdk"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri> - <Sha>709342899e770ba4ab6e674fc5d5d6d90ce67b73</Sha> + <Sha>6f3114fd9c67c64ce1d35ddbdc8450fa465e216d</Sha> <SourceBuild RepoName="aspnetcore" ManagedOnly="true" /> </Dependency> <Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="8.0.1" CoherentParentDependency="Microsoft.NET.Sdk"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri> - <Sha>709342899e770ba4ab6e674fc5d5d6d90ce67b73</Sha> + <Sha>6f3114fd9c67c64ce1d35ddbdc8450fa465e216d</Sha> </Dependency> - <Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0" Version="8.0.1-servicing.23569.3" CoherentParentDependency="Microsoft.NET.Sdk"> + <Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0" Version="8.0.1-servicing.23571.2" CoherentParentDependency="Microsoft.NET.Sdk"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri> - <Sha>709342899e770ba4ab6e674fc5d5d6d90ce67b73</Sha> + <Sha>6f3114fd9c67c64ce1d35ddbdc8450fa465e216d</Sha> </Dependency> - <Dependency Name="dotnet-dev-certs" Version="8.0.1-servicing.23569.3" CoherentParentDependency="Microsoft.NET.Sdk"> + <Dependency Name="dotnet-dev-certs" Version="8.0.1-servicing.23571.2" CoherentParentDependency="Microsoft.NET.Sdk"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri> - <Sha>709342899e770ba4ab6e674fc5d5d6d90ce67b73</Sha> + <Sha>6f3114fd9c67c64ce1d35ddbdc8450fa465e216d</Sha> </Dependency> - <Dependency Name="dotnet-user-jwts" Version="8.0.1-servicing.23569.3" CoherentParentDependency="Microsoft.NET.Sdk"> + <Dependency Name="dotnet-user-jwts" Version="8.0.1-servicing.23571.2" CoherentParentDependency="Microsoft.NET.Sdk"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri> - <Sha>709342899e770ba4ab6e674fc5d5d6d90ce67b73</Sha> + <Sha>6f3114fd9c67c64ce1d35ddbdc8450fa465e216d</Sha> </Dependency> - <Dependency Name="dotnet-user-secrets" Version="8.0.1-servicing.23569.3" CoherentParentDependency="Microsoft.NET.Sdk"> + <Dependency Name="dotnet-user-secrets" Version="8.0.1-servicing.23571.2" CoherentParentDependency="Microsoft.NET.Sdk"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri> - <Sha>709342899e770ba4ab6e674fc5d5d6d90ce67b73</Sha> + <Sha>6f3114fd9c67c64ce1d35ddbdc8450fa465e216d</Sha> </Dependency> <Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="8.0.101"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri> - <Sha>c793265732855639ab1abd311e61bcc014f16e40</Sha> + <Sha>ddf91112f975f0d5329f37471d104779473d0f2c</Sha> </Dependency> - <Dependency Name="Microsoft.TemplateEngine.Cli" Version="8.0.101-servicing.23571.3"> + <Dependency Name="Microsoft.TemplateEngine.Cli" Version="8.0.101-servicing.23571.5"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri> - <Sha>c793265732855639ab1abd311e61bcc014f16e40</Sha> + <Sha>ddf91112f975f0d5329f37471d104779473d0f2c</Sha> </Dependency> - <Dependency Name="Microsoft.NET.Sdk" Version="8.0.101-servicing.23571.3"> + <Dependency Name="Microsoft.NET.Sdk" Version="8.0.101-servicing.23571.5"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri> - <Sha>c793265732855639ab1abd311e61bcc014f16e40</Sha> + <Sha>ddf91112f975f0d5329f37471d104779473d0f2c</Sha> <SourceBuild RepoName="sdk" ManagedOnly="true" /> </Dependency> - <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="8.0.101-servicing.23571.3"> + <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="8.0.101-servicing.23571.5"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri> - <Sha>c793265732855639ab1abd311e61bcc014f16e40</Sha> + <Sha>ddf91112f975f0d5329f37471d104779473d0f2c</Sha> </Dependency> <Dependency Name="Microsoft.DotNet.Test.ProjectTemplates.2.1" Version="1.0.2-beta4.22406.1"> <Uri>https://github.com/dotnet/test-templates</Uri> diff --git a/eng/Versions.props b/eng/Versions.props index 1037734a7..29d28c3c0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -74,11 +74,11 @@ <!-- Dependencies from https://github.com/aspnet/AspNetCore --> <MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>8.0.1</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion> <MicrosoftAspNetCoreAppRefPackageVersion>8.0.1</MicrosoftAspNetCoreAppRefPackageVersion> - <MicrosoftAspNetCoreAppRefInternalPackageVersion>8.0.1-servicing.23569.3</MicrosoftAspNetCoreAppRefInternalPackageVersion> - <VSRedistCommonAspNetCoreSharedFrameworkx6480PackageVersion>8.0.1-servicing.23569.3</VSRedistCommonAspNetCoreSharedFrameworkx6480PackageVersion> - <dotnetdevcertsPackageVersion>8.0.1-servicing.23569.3</dotnetdevcertsPackageVersion> - <dotnetuserjwtsPackageVersion>8.0.1-servicing.23569.3</dotnetuserjwtsPackageVersion> - <dotnetusersecretsPackageVersion>8.0.1-servicing.23569.3</dotnetusersecretsPackageVersion> + <MicrosoftAspNetCoreAppRefInternalPackageVersion>8.0.1-servicing.23571.2</MicrosoftAspNetCoreAppRefInternalPackageVersion> + <VSRedistCommonAspNetCoreSharedFrameworkx6480PackageVersion>8.0.1-servicing.23571.2</VSRedistCommonAspNetCoreSharedFrameworkx6480PackageVersion> + <dotnetdevcertsPackageVersion>8.0.1-servicing.23571.2</dotnetdevcertsPackageVersion> + <dotnetuserjwtsPackageVersion>8.0.1-servicing.23571.2</dotnetuserjwtsPackageVersion> + <dotnetusersecretsPackageVersion>8.0.1-servicing.23571.2</dotnetusersecretsPackageVersion> </PropertyGroup> <PropertyGroup> <MicroBuildCorePackageVersion>0.2.0</MicroBuildCorePackageVersion> @@ -86,8 +86,8 @@ <PropertyGroup> <!-- Dependencies from https://github.com/dotnet/sdk --> <MicrosoftDotNetCommonItemTemplatesPackageVersion>8.0.101</MicrosoftDotNetCommonItemTemplatesPackageVersion> - <MicrosoftNETSdkPackageVersion>8.0.101-servicing.23571.3</MicrosoftNETSdkPackageVersion> - <MicrosoftDotNetMSBuildSdkResolverPackageVersion>8.0.101-servicing.23571.3</MicrosoftDotNetMSBuildSdkResolverPackageVersion> + <MicrosoftNETSdkPackageVersion>8.0.101-servicing.23571.5</MicrosoftNETSdkPackageVersion> + <MicrosoftDotNetMSBuildSdkResolverPackageVersion>8.0.101-servicing.23571.5</MicrosoftDotNetMSBuildSdkResolverPackageVersion> <MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion> <MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion> <MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion>