From 3949e52fddb829602dde50b151c0bf23dad4c0cc Mon Sep 17 00:00:00 2001 From: Matt Thalman <Matt.Thalman@microsoft.com> Date: Fri, 23 Jun 2023 17:44:47 +0000 Subject: [PATCH 01/17] Merged PR 32214: .NET Source-Build 7.0.108 June 2023 OOB Updates update global.json and Versions.props for .NET SDK 7.0.108 From 506a4709e3ca5d32a68b37e2eefd818758a3e4e4 Mon Sep 17 00:00:00 2001 From: DotNet-Bot <dn-bot@microsoft.com> Date: Mon, 17 Jul 2023 19:29:58 +0000 Subject: [PATCH 02/17] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230717.11 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.109 -> To Version 7.0.110 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,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.7.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,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100 From Version 7.0.9 -> To Version 7.0.10 (parent: Microsoft.NET.Sdk --- NuGet.config | 18 ++++---- eng/Version.Details.xml | 100 ++++++++++++++++++++-------------------- eng/Versions.props | 48 +++++++++---------- 3 files changed, 83 insertions(+), 83 deletions(-) diff --git a/NuGet.config b/NuGet.config index 6cb159ba1..ad68f544b 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,23 +7,22 @@ <clear /> <!--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-5a4c82e" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-5a4c82ec/nuget/v3/index.json" /> <!-- End: Package sources from dotnet-aspnetcore --> <!-- Begin: Package sources from dotnet-emsdk --> - <add key="darc-pub-dotnet-emsdk-9b227c1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-9b227c16/nuget/v3/index.json" /> - <add key="darc-pub-dotnet-emsdk-9b227c1-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-9b227c16-2/nuget/v3/index.json" /> - <add key="darc-pub-dotnet-emsdk-9b227c1-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-9b227c16-1/nuget/v3/index.json" /> + <add key="darc-pub-dotnet-emsdk-96ba1fe" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-96ba1fed/nuget/v3/index.json" /> <!-- End: Package sources from dotnet-emsdk --> <!-- Begin: Package sources from DotNet-msbuild-Trusted --> <add key="darc-pub-DotNet-msbuild-Trusted-6918b86" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-6918b863/nuget/v3/index.json" /> <!-- End: Package sources from DotNet-msbuild-Trusted --> <!-- Begin: Package sources from dotnet-runtime --> + <add key="darc-int-dotnet-runtime-a6dbb80" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-a6dbb800/nuget/v3/index.json" /> <!-- End: Package sources from dotnet-runtime --> <!-- Begin: Package sources from dotnet-sdk --> + <add key="darc-int-dotnet-sdk-5894fb6" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-5894fb6b/nuget/v3/index.json" /> <!-- End: Package sources from dotnet-sdk --> <!-- Begin: Package sources from dotnet-windowsdesktop --> - <add key="darc-int-dotnet-windowsdesktop-e346a9e" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-e346a9e9/nuget/v3/index.json" /> - <add key="darc-int-dotnet-windowsdesktop-e346a9e-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-e346a9e9-2/nuget/v3/index.json" /> - <add key="darc-int-dotnet-windowsdesktop-e346a9e-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-e346a9e9-1/nuget/v3/index.json" /> + <add key="darc-int-dotnet-windowsdesktop-f387463" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-f3874631/nuget/v3/index.json" /> <!-- End: Package sources from dotnet-windowsdesktop --> <!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.--> <add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" /> @@ -45,14 +44,15 @@ <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-5a4c82e" value="true" /> <!-- End: Package sources from dotnet-aspnetcore --> <!-- Begin: Package sources from dotnet-runtime --> + <add key="darc-int-dotnet-runtime-a6dbb80" value="true" /> <!-- Begin: Package sources from dotnet-sdk --> + <add key="darc-int-dotnet-sdk-5894fb6" value="true" /> <!-- End: Package sources from dotnet-sdk --> <!-- Begin: Package sources from dotnet-windowsdesktop --> - <add key="darc-int-dotnet-windowsdesktop-e346a9e-1" value="true" /> - <add key="darc-int-dotnet-windowsdesktop-e346a9e-2" value="true" /> - <add key="darc-int-dotnet-windowsdesktop-e346a9e" value="true" /> + <add key="darc-int-dotnet-windowsdesktop-f387463" value="true" /> <!-- End: Package sources from dotnet-windowsdesktop --> <!-- End: Package sources from dotnet-runtime --> <!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.--> diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9fb3411c5..b47273165 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ <?xml version="1.0" encoding="utf-8"?> <Dependencies> <ProductDependencies> - <Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="7.0.9" CoherentParentDependency="Microsoft.NET.Sdk"> + <Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="7.0.10" CoherentParentDependency="Microsoft.NET.Sdk"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri> - <Sha>e346a9e945fd8fb247ca06c129c68458b0713cd8</Sha> + <Sha>f3874631f8761a385650af9a44d3254f8839e6e9</Sha> </Dependency> - <Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0" Version="7.0.9-servicing.23321.11" CoherentParentDependency="Microsoft.NET.Sdk"> + <Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0" Version="7.0.10-servicing.23364.4" CoherentParentDependency="Microsoft.NET.Sdk"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri> - <Sha>e346a9e945fd8fb247ca06c129c68458b0713cd8</Sha> + <Sha>f3874631f8761a385650af9a44d3254f8839e6e9</Sha> </Dependency> - <Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0" Version="7.0.9-servicing.23321.11" CoherentParentDependency="Microsoft.NET.Sdk"> + <Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0" Version="7.0.10-servicing.23364.4" CoherentParentDependency="Microsoft.NET.Sdk"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri> - <Sha>e346a9e945fd8fb247ca06c129c68458b0713cd8</Sha> + <Sha>f3874631f8761a385650af9a44d3254f8839e6e9</Sha> </Dependency> - <Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="7.0.9" CoherentParentDependency="Microsoft.NET.Sdk"> + <Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="7.0.10" CoherentParentDependency="Microsoft.NET.Sdk"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri> - <Sha>e346a9e945fd8fb247ca06c129c68458b0713cd8</Sha> + <Sha>f3874631f8761a385650af9a44d3254f8839e6e9</Sha> </Dependency> - <Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.7.0" Version="7.0.9-servicing.23320.18" CoherentParentDependency="Microsoft.NET.Sdk"> + <Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.7.0" Version="7.0.10-servicing.23363.12" CoherentParentDependency="Microsoft.NET.Sdk"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> - <Sha>8e9a17b2216f51a5788f8b1c467a4cf3b769e7d7</Sha> + <Sha>a6dbb800a47735bde43187350fd3aff4071c7f9c</Sha> </Dependency> - <Dependency Name="Microsoft.NETCore.App.Ref" Version="7.0.9" CoherentParentDependency="Microsoft.NET.Sdk"> + <Dependency Name="Microsoft.NETCore.App.Ref" Version="7.0.10" CoherentParentDependency="Microsoft.NET.Sdk"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> - <Sha>8e9a17b2216f51a5788f8b1c467a4cf3b769e7d7</Sha> + <Sha>a6dbb800a47735bde43187350fd3aff4071c7f9c</Sha> </Dependency> - <Dependency Name="VS.Redist.Common.NetCore.TargetingPack.x64.7.0" Version="7.0.9-servicing.23320.18" CoherentParentDependency="Microsoft.NET.Sdk"> + <Dependency Name="VS.Redist.Common.NetCore.TargetingPack.x64.7.0" Version="7.0.10-servicing.23363.12" CoherentParentDependency="Microsoft.NET.Sdk"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> - <Sha>8e9a17b2216f51a5788f8b1c467a4cf3b769e7d7</Sha> + <Sha>a6dbb800a47735bde43187350fd3aff4071c7f9c</Sha> </Dependency> - <Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="7.0.9" CoherentParentDependency="Microsoft.NET.Sdk"> + <Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="7.0.10" CoherentParentDependency="Microsoft.NET.Sdk"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> - <Sha>8e9a17b2216f51a5788f8b1c467a4cf3b769e7d7</Sha> + <Sha>a6dbb800a47735bde43187350fd3aff4071c7f9c</Sha> <SourceBuildTarball RepoName="runtime" ManagedOnly="true" /> </Dependency> - <Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="7.0.9" CoherentParentDependency="Microsoft.NET.Sdk"> + <Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="7.0.10" CoherentParentDependency="Microsoft.NET.Sdk"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> - <Sha>8e9a17b2216f51a5788f8b1c467a4cf3b769e7d7</Sha> + <Sha>a6dbb800a47735bde43187350fd3aff4071c7f9c</Sha> </Dependency> - <Dependency Name="Microsoft.NETCore.DotNetHostResolver" Version="7.0.9" CoherentParentDependency="Microsoft.NET.Sdk"> + <Dependency Name="Microsoft.NETCore.DotNetHostResolver" Version="7.0.10" CoherentParentDependency="Microsoft.NET.Sdk"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> - <Sha>8e9a17b2216f51a5788f8b1c467a4cf3b769e7d7</Sha> + <Sha>a6dbb800a47735bde43187350fd3aff4071c7f9c</Sha> </Dependency> <!-- Change blob version in GenerateLayout.targets if this is unpinned to service targeting pack --> <!-- No new netstandard.library planned for 3.1 timeframe at this time. --> @@ -52,34 +52,34 @@ <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> <Sha>8e9a17b2216f51a5788f8b1c467a4cf3b769e7d7</Sha> </Dependency> - <Dependency Name="Microsoft.AspNetCore.App.Ref" Version="7.0.9" CoherentParentDependency="Microsoft.NET.Sdk"> + <Dependency Name="Microsoft.AspNetCore.App.Ref" Version="7.0.10" CoherentParentDependency="Microsoft.NET.Sdk"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri> - <Sha>b506e2cb7b6c0fe787305f8cfdee046b7b3f9a53</Sha> + <Sha>5a4c82ec57fadddef9ce841d608de5c7c8c74446</Sha> </Dependency> - <Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="7.0.9-servicing.23321.10" CoherentParentDependency="Microsoft.NET.Sdk"> + <Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="7.0.10-servicing.23364.39" CoherentParentDependency="Microsoft.NET.Sdk"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri> - <Sha>b506e2cb7b6c0fe787305f8cfdee046b7b3f9a53</Sha> + <Sha>5a4c82ec57fadddef9ce841d608de5c7c8c74446</Sha> <SourceBuild RepoName="aspnetcore" ManagedOnly="true" /> </Dependency> - <Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="7.0.9" CoherentParentDependency="Microsoft.NET.Sdk"> + <Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="7.0.10" CoherentParentDependency="Microsoft.NET.Sdk"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri> - <Sha>b506e2cb7b6c0fe787305f8cfdee046b7b3f9a53</Sha> + <Sha>5a4c82ec57fadddef9ce841d608de5c7c8c74446</Sha> </Dependency> - <Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0" Version="7.0.9-servicing.23321.10" CoherentParentDependency="Microsoft.NET.Sdk"> + <Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0" Version="7.0.10-servicing.23364.39" CoherentParentDependency="Microsoft.NET.Sdk"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri> - <Sha>b506e2cb7b6c0fe787305f8cfdee046b7b3f9a53</Sha> + <Sha>5a4c82ec57fadddef9ce841d608de5c7c8c74446</Sha> </Dependency> - <Dependency Name="dotnet-dev-certs" Version="7.0.9-servicing.23321.10" CoherentParentDependency="Microsoft.NET.Sdk"> + <Dependency Name="dotnet-dev-certs" Version="7.0.10-servicing.23364.39" CoherentParentDependency="Microsoft.NET.Sdk"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri> - <Sha>b506e2cb7b6c0fe787305f8cfdee046b7b3f9a53</Sha> + <Sha>5a4c82ec57fadddef9ce841d608de5c7c8c74446</Sha> </Dependency> - <Dependency Name="dotnet-user-jwts" Version="7.0.9-servicing.23321.10" CoherentParentDependency="Microsoft.NET.Sdk"> + <Dependency Name="dotnet-user-jwts" Version="7.0.10-servicing.23364.39" CoherentParentDependency="Microsoft.NET.Sdk"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri> - <Sha>b506e2cb7b6c0fe787305f8cfdee046b7b3f9a53</Sha> + <Sha>5a4c82ec57fadddef9ce841d608de5c7c8c74446</Sha> </Dependency> - <Dependency Name="dotnet-user-secrets" Version="7.0.9-servicing.23321.10" CoherentParentDependency="Microsoft.NET.Sdk"> + <Dependency Name="dotnet-user-secrets" Version="7.0.10-servicing.23364.39" CoherentParentDependency="Microsoft.NET.Sdk"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri> - <Sha>b506e2cb7b6c0fe787305f8cfdee046b7b3f9a53</Sha> + <Sha>5a4c82ec57fadddef9ce841d608de5c7c8c74446</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> @@ -98,31 +98,31 @@ <Sha>aaaa0c1826f97a9dfcc67e94136bf01010b55f23</Sha> <SourceBuild RepoName="test-templates" ManagedOnly="true" /> </Dependency> - <Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="7.0.109"> + <Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="7.0.110"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri> - <Sha>2b3241fd09fe88b953a4fca6b8e79fa7e993c488</Sha> + <Sha>5894fb6b8bf36d3e36b2a9c68ce660bdb4541bb3</Sha> </Dependency> - <Dependency Name="Microsoft.TemplateEngine.Cli" Version="7.0.109-servicing.23322.18"> + <Dependency Name="Microsoft.TemplateEngine.Cli" Version="7.0.110-servicing.23367.11"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri> - <Sha>2b3241fd09fe88b953a4fca6b8e79fa7e993c488</Sha> + <Sha>5894fb6b8bf36d3e36b2a9c68ce660bdb4541bb3</Sha> </Dependency> - <Dependency Name="Microsoft.NET.Sdk" Version="7.0.109-servicing.23322.18"> + <Dependency Name="Microsoft.NET.Sdk" Version="7.0.110-servicing.23367.11"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri> - <Sha>2b3241fd09fe88b953a4fca6b8e79fa7e993c488</Sha> + <Sha>5894fb6b8bf36d3e36b2a9c68ce660bdb4541bb3</Sha> <SourceBuild RepoName="sdk" ManagedOnly="true" /> </Dependency> - <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="7.0.109-servicing.23322.18"> + <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="7.0.110-servicing.23367.11"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri> - <Sha>2b3241fd09fe88b953a4fca6b8e79fa7e993c488</Sha> + <Sha>5894fb6b8bf36d3e36b2a9c68ce660bdb4541bb3</Sha> </Dependency> <!-- For coherency purposes, these versions should be gated by the versions of winforms and wpf routed via windowsdesktop --> - <Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="7.0.9-servicing.23321.6" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64"> + <Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="7.0.10-servicing.23363.13" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-winforms</Uri> - <Sha>dd121ee97234c7490f6111cf0c7bfa9235923f81</Sha> + <Sha>05b68f8296b45fa76b27abcb8e5666e73a4873b7</Sha> </Dependency> - <Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="7.0.9-servicing.23321.9" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64"> + <Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="7.0.10-servicing.23364.1" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri> - <Sha>d41bd7da4139331ef02657deb7944df43b8a181c</Sha> + <Sha>5461ffc0ad318e6e60746a1440c67866d74b507e</Sha> </Dependency> <Dependency Name="Microsoft.FSharp.Compiler" Version="12.4.0-beta.22571.5" CoherentParentDependency="Microsoft.NET.Sdk"> <Uri>https://github.com/dotnet/fsharp</Uri> @@ -163,13 +163,13 @@ <Uri>https://github.com/Microsoft/ApplicationInsights-dotnet</Uri> <Sha>53b80940842204f78708a538628288ff5d741a1d</Sha> </Dependency> - <Dependency Name="Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100" Version="7.0.9" CoherentParentDependency="VS.Redist.Common.NetCore.SharedFramework.x64.7.0"> + <Dependency Name="Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100" Version="7.0.10" CoherentParentDependency="VS.Redist.Common.NetCore.SharedFramework.x64.7.0"> <Uri>https://github.com/dotnet/emsdk</Uri> - <Sha>9b227c1606a01920839873f840f6b76f7b492a66</Sha> + <Sha>96ba1fedbcfb742d0d154532f6ac3c30d14a5f7d</Sha> </Dependency> - <Dependency Name="Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100" Version="7.0.9" CoherentParentDependency="VS.Redist.Common.NetCore.SharedFramework.x64.7.0"> + <Dependency Name="Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100" Version="7.0.10" CoherentParentDependency="VS.Redist.Common.NetCore.SharedFramework.x64.7.0"> <Uri>https://github.com/dotnet/emsdk</Uri> - <Sha>9b227c1606a01920839873f840f6b76f7b492a66</Sha> + <Sha>96ba1fedbcfb742d0d154532f6ac3c30d14a5f7d</Sha> </Dependency> <Dependency Name="Microsoft.Deployment.DotNet.Releases" Version="1.0.0-preview5.1.22263.1"> <Uri>https://github.com/dotnet/deployment-tools</Uri> diff --git a/eng/Versions.props b/eng/Versions.props index a83b35744..8772a865a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,11 +37,11 @@ </PropertyGroup> <PropertyGroup> <!-- Dependency from https://github.com/dotnet/winforms --> - <MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>7.0.9-servicing.23321.6</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion> + <MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>7.0.10-servicing.23363.13</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion> </PropertyGroup> <PropertyGroup> <!-- Dependency from https://github.com/dotnet/wpf --> - <MicrosoftDotNetWpfProjectTemplatesPackageVersion>7.0.9-servicing.23321.9</MicrosoftDotNetWpfProjectTemplatesPackageVersion> + <MicrosoftDotNetWpfProjectTemplatesPackageVersion>7.0.10-servicing.23364.1</MicrosoftDotNetWpfProjectTemplatesPackageVersion> </PropertyGroup> <PropertyGroup> <!-- Dependency from https://github.com/dotnet/test-templates --> @@ -56,22 +56,22 @@ </PropertyGroup> <PropertyGroup> <!-- Dependencies from https://github.com/aspnet/AspNetCore --> - <MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>7.0.9</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion> - <MicrosoftAspNetCoreAppRefPackageVersion>7.0.9</MicrosoftAspNetCoreAppRefPackageVersion> - <MicrosoftAspNetCoreAppRefInternalPackageVersion>7.0.9-servicing.23321.10</MicrosoftAspNetCoreAppRefInternalPackageVersion> - <VSRedistCommonAspNetCoreSharedFrameworkx6470PackageVersion>7.0.9-servicing.23321.10</VSRedistCommonAspNetCoreSharedFrameworkx6470PackageVersion> - <dotnetdevcertsPackageVersion>7.0.9-servicing.23321.10</dotnetdevcertsPackageVersion> - <dotnetuserjwtsPackageVersion>7.0.9-servicing.23321.10</dotnetuserjwtsPackageVersion> - <dotnetusersecretsPackageVersion>7.0.9-servicing.23321.10</dotnetusersecretsPackageVersion> + <MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>7.0.10</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion> + <MicrosoftAspNetCoreAppRefPackageVersion>7.0.10</MicrosoftAspNetCoreAppRefPackageVersion> + <MicrosoftAspNetCoreAppRefInternalPackageVersion>7.0.10-servicing.23364.39</MicrosoftAspNetCoreAppRefInternalPackageVersion> + <VSRedistCommonAspNetCoreSharedFrameworkx6470PackageVersion>7.0.10-servicing.23364.39</VSRedistCommonAspNetCoreSharedFrameworkx6470PackageVersion> + <dotnetdevcertsPackageVersion>7.0.10-servicing.23364.39</dotnetdevcertsPackageVersion> + <dotnetuserjwtsPackageVersion>7.0.10-servicing.23364.39</dotnetuserjwtsPackageVersion> + <dotnetusersecretsPackageVersion>7.0.10-servicing.23364.39</dotnetusersecretsPackageVersion> </PropertyGroup> <PropertyGroup> <MicroBuildCorePackageVersion>0.2.0</MicroBuildCorePackageVersion> </PropertyGroup> <PropertyGroup> <!-- Dependencies from https://github.com/dotnet/sdk --> - <MicrosoftDotNetCommonItemTemplatesPackageVersion>7.0.109</MicrosoftDotNetCommonItemTemplatesPackageVersion> - <MicrosoftNETSdkPackageVersion>7.0.109-servicing.23322.18</MicrosoftNETSdkPackageVersion> - <MicrosoftDotNetMSBuildSdkResolverPackageVersion>7.0.109-servicing.23322.18</MicrosoftDotNetMSBuildSdkResolverPackageVersion> + <MicrosoftDotNetCommonItemTemplatesPackageVersion>7.0.110</MicrosoftDotNetCommonItemTemplatesPackageVersion> + <MicrosoftNETSdkPackageVersion>7.0.110-servicing.23367.11</MicrosoftNETSdkPackageVersion> + <MicrosoftDotNetMSBuildSdkResolverPackageVersion>7.0.110-servicing.23367.11</MicrosoftDotNetMSBuildSdkResolverPackageVersion> <MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion> <MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion> <MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion> @@ -82,20 +82,20 @@ </PropertyGroup> <PropertyGroup> <!-- Dependencies from https://github.com/dotnet/core-setup --> - <VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion>7.0.9-servicing.23320.18</VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion> - <VSRedistCommonNetCoreTargetingPackx6470PackageVersion>7.0.9-servicing.23320.18</VSRedistCommonNetCoreTargetingPackx6470PackageVersion> - <MicrosoftNETCoreAppRuntimewinx64PackageVersion>7.0.9</MicrosoftNETCoreAppRuntimewinx64PackageVersion> - <MicrosoftNETCoreAppHostwinx64PackageVersion>7.0.9</MicrosoftNETCoreAppHostwinx64PackageVersion> - <MicrosoftNETCoreAppRefPackageVersion>7.0.9</MicrosoftNETCoreAppRefPackageVersion> - <MicrosoftNETCoreDotNetHostResolverPackageVersion>7.0.9</MicrosoftNETCoreDotNetHostResolverPackageVersion> + <VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion>7.0.10-servicing.23363.12</VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion> + <VSRedistCommonNetCoreTargetingPackx6470PackageVersion>7.0.10-servicing.23363.12</VSRedistCommonNetCoreTargetingPackx6470PackageVersion> + <MicrosoftNETCoreAppRuntimewinx64PackageVersion>7.0.10</MicrosoftNETCoreAppRuntimewinx64PackageVersion> + <MicrosoftNETCoreAppHostwinx64PackageVersion>7.0.10</MicrosoftNETCoreAppHostwinx64PackageVersion> + <MicrosoftNETCoreAppRefPackageVersion>7.0.10</MicrosoftNETCoreAppRefPackageVersion> + <MicrosoftNETCoreDotNetHostResolverPackageVersion>7.0.10</MicrosoftNETCoreDotNetHostResolverPackageVersion> <NETStandardLibraryRefPackageVersion>2.1.0</NETStandardLibraryRefPackageVersion> </PropertyGroup> <PropertyGroup> <!-- Dependencies from https://github.com/dotnet/windowsdesktop --> - <VSRedistCommonWindowsDesktopSharedFrameworkx6470PackageVersion>7.0.9-servicing.23321.11</VSRedistCommonWindowsDesktopSharedFrameworkx6470PackageVersion> - <VSRedistCommonWindowsDesktopTargetingPackx6470PackageVersion>7.0.9-servicing.23321.11</VSRedistCommonWindowsDesktopTargetingPackx6470PackageVersion> - <MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>7.0.9</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion> - <MicrosoftWindowsDesktopAppRefPackageVersion>7.0.9</MicrosoftWindowsDesktopAppRefPackageVersion> + <VSRedistCommonWindowsDesktopSharedFrameworkx6470PackageVersion>7.0.10-servicing.23364.4</VSRedistCommonWindowsDesktopSharedFrameworkx6470PackageVersion> + <VSRedistCommonWindowsDesktopTargetingPackx6470PackageVersion>7.0.10-servicing.23364.4</VSRedistCommonWindowsDesktopTargetingPackx6470PackageVersion> + <MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>7.0.10</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion> + <MicrosoftWindowsDesktopAppRefPackageVersion>7.0.10</MicrosoftWindowsDesktopAppRefPackageVersion> </PropertyGroup> <PropertyGroup> <!-- Runtime and Apphost pack versions are the same for all RIDs. We flow the x64 --> @@ -228,8 +228,8 @@ <XamarinMacOSWorkloadManifestVersion>12.3.2372</XamarinMacOSWorkloadManifestVersion> <XamarinTvOSWorkloadManifestVersion>16.0.1478</XamarinTvOSWorkloadManifestVersion> <MonoWorkloadManifestVersion>$(MicrosoftNETCoreAppRefPackageVersion)</MonoWorkloadManifestVersion> - <MicrosoftNETWorkloadEmscriptennet6Manifest70100Version>7.0.9</MicrosoftNETWorkloadEmscriptennet6Manifest70100Version> - <MicrosoftNETWorkloadEmscriptennet7Manifest70100Version>7.0.9</MicrosoftNETWorkloadEmscriptennet7Manifest70100Version> + <MicrosoftNETWorkloadEmscriptennet6Manifest70100Version>7.0.10</MicrosoftNETWorkloadEmscriptennet6Manifest70100Version> + <MicrosoftNETWorkloadEmscriptennet7Manifest70100Version>7.0.10</MicrosoftNETWorkloadEmscriptennet7Manifest70100Version> <EmscriptenWorkloadManifestVersion>$(MicrosoftNETWorkloadEmscriptennet7Manifest70100Version)</EmscriptenWorkloadManifestVersion> </PropertyGroup> <PropertyGroup> From 32fa432c6f99c91cac86be5a18672ad02157bac4 Mon Sep 17 00:00:00 2001 From: Matt Mitchell <mmitche@microsoft.com> Date: Mon, 17 Jul 2023 13:30:05 -0700 Subject: [PATCH 03/17] Remove applied source build patch --- ...explicit-System.Text.Json-dependency.patch | 31 ------------------- 1 file changed, 31 deletions(-) delete mode 100644 src/SourceBuild/tarball/patches/sdk/0001-Add-explicit-System.Text.Json-dependency.patch diff --git a/src/SourceBuild/tarball/patches/sdk/0001-Add-explicit-System.Text.Json-dependency.patch b/src/SourceBuild/tarball/patches/sdk/0001-Add-explicit-System.Text.Json-dependency.patch deleted file mode 100644 index 74e217fbe..000000000 --- a/src/SourceBuild/tarball/patches/sdk/0001-Add-explicit-System.Text.Json-dependency.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Nikola Milosavljevic <nikolam@microsoft.com> -Date: Mon, 26 Jun 2023 23:02:20 +0000 -Subject: [PATCH] Add explicit System.Text.Json dependency - -Adding an excplicit System.Text.Json dependency to prevent transitive dependency to be picked up -from PSB, via Microsoft.Build package. - -Backport: https://github.com/dotnet/sdk/pull/33618 ---- - src/BuiltInTools/dotnet-watch/dotnet-watch.csproj | 7 +++++++ - 1 file changed, 7 insertions(+) - -diff --git a/src/BuiltInTools/dotnet-watch/dotnet-watch.csproj b/src/BuiltInTools/dotnet-watch/dotnet-watch.csproj -index 065f750f72..13d2c1ed99 100644 ---- a/src/BuiltInTools/dotnet-watch/dotnet-watch.csproj -+++ b/src/BuiltInTools/dotnet-watch/dotnet-watch.csproj -@@ -23,6 +23,13 @@ - <PackageReference Include="Microsoft.Build.Locator" Version="$(MicrosoftBuildLocatorPackageVersion)" /> - <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Features" Version="$(MicrosoftCodeAnalysisCSharpFeaturesPackageVersion)" /> - <PackageReference Include="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="$(MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion)" /> -+ -+ <!-- -+ Explicit System.Text.Json package reference is required for source-build to pick up the live package. -+ Avoids picking up an old version via transitive dependency from Microsoft.Build or Microsoft.CodeAnalysis.Workspaces.MSBuild. -+ --> -+ <PackageReference Include="System.Text.Json" Version="$(SystemTextJsonVersion)" Condition="'$(DotnetBuildFromSource)' == 'true'" /> -+ - <Compile Include="$(RepoRoot)src\Common\PathUtilities.cs" LinkBase="Common" /> - </ItemGroup> - From debaabc7c8450ff74a47214c6a5214c666c6ec04 Mon Sep 17 00:00:00 2001 From: DotNet-Bot <dn-bot@microsoft.com> Date: Mon, 17 Jul 2023 21:06:50 +0000 Subject: [PATCH 04/17] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230717.22 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.110 -> To Version 7.0.110 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates From Version 7.0.10 -> To Version 7.0.10 (parent: Microsoft.NET.Sdk --- NuGet.config | 8 ++++---- eng/Version.Details.xml | 34 +++++++++++++++++----------------- eng/Versions.props | 12 ++++++------ 3 files changed, 27 insertions(+), 27 deletions(-) diff --git a/NuGet.config b/NuGet.config index ad68f544b..fc3d06124 100644 --- a/NuGet.config +++ b/NuGet.config @@ -19,10 +19,10 @@ <add key="darc-int-dotnet-runtime-a6dbb80" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-a6dbb800/nuget/v3/index.json" /> <!-- End: Package sources from dotnet-runtime --> <!-- Begin: Package sources from dotnet-sdk --> - <add key="darc-int-dotnet-sdk-5894fb6" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-5894fb6b/nuget/v3/index.json" /> + <add key="darc-int-dotnet-sdk-82f22c4" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-82f22c43/nuget/v3/index.json" /> <!-- End: Package sources from dotnet-sdk --> <!-- Begin: Package sources from dotnet-windowsdesktop --> - <add key="darc-int-dotnet-windowsdesktop-f387463" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-f3874631/nuget/v3/index.json" /> + <add key="darc-int-dotnet-windowsdesktop-996ed6b" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-996ed6b0/nuget/v3/index.json" /> <!-- End: Package sources from dotnet-windowsdesktop --> <!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.--> <add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" /> @@ -49,10 +49,10 @@ <!-- Begin: Package sources from dotnet-runtime --> <add key="darc-int-dotnet-runtime-a6dbb80" value="true" /> <!-- Begin: Package sources from dotnet-sdk --> - <add key="darc-int-dotnet-sdk-5894fb6" value="true" /> + <add key="darc-int-dotnet-sdk-82f22c4" value="true" /> <!-- End: Package sources from dotnet-sdk --> <!-- Begin: Package sources from dotnet-windowsdesktop --> - <add key="darc-int-dotnet-windowsdesktop-f387463" value="true" /> + <add key="darc-int-dotnet-windowsdesktop-996ed6b" value="true" /> <!-- End: Package sources from dotnet-windowsdesktop --> <!-- End: Package sources from dotnet-runtime --> <!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.--> diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b47273165..7f105b121 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ <ProductDependencies> <Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="7.0.10" CoherentParentDependency="Microsoft.NET.Sdk"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri> - <Sha>f3874631f8761a385650af9a44d3254f8839e6e9</Sha> + <Sha>996ed6b07099f377a6b05581860a1f66a30aca00</Sha> </Dependency> - <Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0" Version="7.0.10-servicing.23364.4" CoherentParentDependency="Microsoft.NET.Sdk"> + <Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0" Version="7.0.10-servicing.23367.2" CoherentParentDependency="Microsoft.NET.Sdk"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri> - <Sha>f3874631f8761a385650af9a44d3254f8839e6e9</Sha> + <Sha>996ed6b07099f377a6b05581860a1f66a30aca00</Sha> </Dependency> - <Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0" Version="7.0.10-servicing.23364.4" CoherentParentDependency="Microsoft.NET.Sdk"> + <Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0" Version="7.0.10-servicing.23367.2" CoherentParentDependency="Microsoft.NET.Sdk"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri> - <Sha>f3874631f8761a385650af9a44d3254f8839e6e9</Sha> + <Sha>996ed6b07099f377a6b05581860a1f66a30aca00</Sha> </Dependency> <Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="7.0.10" CoherentParentDependency="Microsoft.NET.Sdk"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri> - <Sha>f3874631f8761a385650af9a44d3254f8839e6e9</Sha> + <Sha>996ed6b07099f377a6b05581860a1f66a30aca00</Sha> </Dependency> <Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.7.0" Version="7.0.10-servicing.23363.12" CoherentParentDependency="Microsoft.NET.Sdk"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> @@ -100,29 +100,29 @@ </Dependency> <Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="7.0.110"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri> - <Sha>5894fb6b8bf36d3e36b2a9c68ce660bdb4541bb3</Sha> + <Sha>82f22c431bb683309ba75d749d920ae8ffb06c02</Sha> </Dependency> - <Dependency Name="Microsoft.TemplateEngine.Cli" Version="7.0.110-servicing.23367.11"> + <Dependency Name="Microsoft.TemplateEngine.Cli" Version="7.0.110-servicing.23367.22"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri> - <Sha>5894fb6b8bf36d3e36b2a9c68ce660bdb4541bb3</Sha> + <Sha>82f22c431bb683309ba75d749d920ae8ffb06c02</Sha> </Dependency> - <Dependency Name="Microsoft.NET.Sdk" Version="7.0.110-servicing.23367.11"> + <Dependency Name="Microsoft.NET.Sdk" Version="7.0.110-servicing.23367.22"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri> - <Sha>5894fb6b8bf36d3e36b2a9c68ce660bdb4541bb3</Sha> + <Sha>82f22c431bb683309ba75d749d920ae8ffb06c02</Sha> <SourceBuild RepoName="sdk" ManagedOnly="true" /> </Dependency> - <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="7.0.110-servicing.23367.11"> + <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="7.0.110-servicing.23367.22"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri> - <Sha>5894fb6b8bf36d3e36b2a9c68ce660bdb4541bb3</Sha> + <Sha>82f22c431bb683309ba75d749d920ae8ffb06c02</Sha> </Dependency> <!-- For coherency purposes, these versions should be gated by the versions of winforms and wpf routed via windowsdesktop --> - <Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="7.0.10-servicing.23363.13" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64"> + <Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="7.0.10-servicing.23364.5" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-winforms</Uri> - <Sha>05b68f8296b45fa76b27abcb8e5666e73a4873b7</Sha> + <Sha>1f1ac283c5d3bb3302111f8aef567a3541863c49</Sha> </Dependency> - <Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="7.0.10-servicing.23364.1" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64"> + <Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="7.0.10-servicing.23364.4" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri> - <Sha>5461ffc0ad318e6e60746a1440c67866d74b507e</Sha> + <Sha>9a9892f5204f1a1b31ab2c81b025d6e35e0f3693</Sha> </Dependency> <Dependency Name="Microsoft.FSharp.Compiler" Version="12.4.0-beta.22571.5" CoherentParentDependency="Microsoft.NET.Sdk"> <Uri>https://github.com/dotnet/fsharp</Uri> diff --git a/eng/Versions.props b/eng/Versions.props index 8772a865a..05ceab0e0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,11 +37,11 @@ </PropertyGroup> <PropertyGroup> <!-- Dependency from https://github.com/dotnet/winforms --> - <MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>7.0.10-servicing.23363.13</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion> + <MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>7.0.10-servicing.23364.5</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion> </PropertyGroup> <PropertyGroup> <!-- Dependency from https://github.com/dotnet/wpf --> - <MicrosoftDotNetWpfProjectTemplatesPackageVersion>7.0.10-servicing.23364.1</MicrosoftDotNetWpfProjectTemplatesPackageVersion> + <MicrosoftDotNetWpfProjectTemplatesPackageVersion>7.0.10-servicing.23364.4</MicrosoftDotNetWpfProjectTemplatesPackageVersion> </PropertyGroup> <PropertyGroup> <!-- Dependency from https://github.com/dotnet/test-templates --> @@ -70,8 +70,8 @@ <PropertyGroup> <!-- Dependencies from https://github.com/dotnet/sdk --> <MicrosoftDotNetCommonItemTemplatesPackageVersion>7.0.110</MicrosoftDotNetCommonItemTemplatesPackageVersion> - <MicrosoftNETSdkPackageVersion>7.0.110-servicing.23367.11</MicrosoftNETSdkPackageVersion> - <MicrosoftDotNetMSBuildSdkResolverPackageVersion>7.0.110-servicing.23367.11</MicrosoftDotNetMSBuildSdkResolverPackageVersion> + <MicrosoftNETSdkPackageVersion>7.0.110-servicing.23367.22</MicrosoftNETSdkPackageVersion> + <MicrosoftDotNetMSBuildSdkResolverPackageVersion>7.0.110-servicing.23367.22</MicrosoftDotNetMSBuildSdkResolverPackageVersion> <MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion> <MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion> <MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion> @@ -92,8 +92,8 @@ </PropertyGroup> <PropertyGroup> <!-- Dependencies from https://github.com/dotnet/windowsdesktop --> - <VSRedistCommonWindowsDesktopSharedFrameworkx6470PackageVersion>7.0.10-servicing.23364.4</VSRedistCommonWindowsDesktopSharedFrameworkx6470PackageVersion> - <VSRedistCommonWindowsDesktopTargetingPackx6470PackageVersion>7.0.10-servicing.23364.4</VSRedistCommonWindowsDesktopTargetingPackx6470PackageVersion> + <VSRedistCommonWindowsDesktopSharedFrameworkx6470PackageVersion>7.0.10-servicing.23367.2</VSRedistCommonWindowsDesktopSharedFrameworkx6470PackageVersion> + <VSRedistCommonWindowsDesktopTargetingPackx6470PackageVersion>7.0.10-servicing.23367.2</VSRedistCommonWindowsDesktopTargetingPackx6470PackageVersion> <MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>7.0.10</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion> <MicrosoftWindowsDesktopAppRefPackageVersion>7.0.10</MicrosoftWindowsDesktopAppRefPackageVersion> </PropertyGroup> From ba920f88aceb29ba2178e33e51cbe5c6963e2a4a Mon Sep 17 00:00:00 2001 From: Matt Thalman <Matt.Thalman@microsoft.com> Date: Tue, 18 Jul 2023 19:05:47 +0000 Subject: [PATCH 05/17] Merged PR 32725: Revert "Update SB SDK diff baseline (#16973)" Reverts the changes that were made in https://github.com/dotnet/installer/pull/16973. This change is only relevant in the internal repo. --- .../assets/baselines/MsftToSbSdk.diff | 101 +----------------- 1 file changed, 5 insertions(+), 96 deletions(-) diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdk.diff b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdk.diff index 4d662a3c3..bd443698c 100644 --- a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdk.diff +++ b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdk.diff @@ -14,23 +14,7 @@ index ------------ ./packs/Microsoft.AspNetCore.App.Ref/ ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ @@ ------------ @@ - ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/Microsoft.JSInterop.xml - ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/Microsoft.Net.Http.Headers.dll - ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/Microsoft.Net.Http.Headers.xml -+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Diagnostics.DiagnosticSource.dll -+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Diagnostics.DiagnosticSource.xml - ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Diagnostics.EventLog.dll - ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Diagnostics.EventLog.xml -+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Formats.Asn1.dll -+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Formats.Asn1.xml - ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.IO.Pipelines.dll - ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.IO.Pipelines.xml - ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Security.Cryptography.Xml.dll ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Security.Cryptography.Xml.xml -+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Text.Encodings.Web.dll -+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Text.Encodings.Web.xml -+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Text.Json.dll -+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Text.Json.xml ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Threading.RateLimiting.dll ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Threading.RateLimiting.xml -./packs/Microsoft.NETCore.App.Host.portable-rid/ @@ -125,35 +109,6 @@ index ------------ ./sdk/x.y.z/DotnetTools/dotnet-format/tr/ ./sdk/x.y.z/DotnetTools/dotnet-format/tr/dotnet-format.resources.dll ./sdk/x.y.z/DotnetTools/dotnet-format/tr/Microsoft.CodeAnalysis.CSharp.Features.resources.dll -@@ ------------ @@ - ./sdk/x.y.z/DotnetTools/dotnet-user-jwts/x.y.z/tools/netx.y/any/Microsoft.IdentityModel.JsonWebTokens.dll - ./sdk/x.y.z/DotnetTools/dotnet-user-jwts/x.y.z/tools/netx.y/any/Microsoft.IdentityModel.Logging.dll - ./sdk/x.y.z/DotnetTools/dotnet-user-jwts/x.y.z/tools/netx.y/any/Microsoft.IdentityModel.Tokens.dll -+./sdk/x.y.z/DotnetTools/dotnet-user-jwts/x.y.z/tools/netx.y/any/runtimes/ -+./sdk/x.y.z/DotnetTools/dotnet-user-jwts/x.y.z/tools/netx.y/any/runtimes/browser/ -+./sdk/x.y.z/DotnetTools/dotnet-user-jwts/x.y.z/tools/netx.y/any/runtimes/browser/lib/ -+./sdk/x.y.z/DotnetTools/dotnet-user-jwts/x.y.z/tools/netx.y/any/runtimes/browser/lib/netx.y/ -+./sdk/x.y.z/DotnetTools/dotnet-user-jwts/x.y.z/tools/netx.y/any/runtimes/browser/lib/netx.y/System.Text.Encodings.Web.dll - ./sdk/x.y.z/DotnetTools/dotnet-user-jwts/x.y.z/tools/netx.y/any/System.IdentityModel.Tokens.Jwt.dll -+./sdk/x.y.z/DotnetTools/dotnet-user-jwts/x.y.z/tools/netx.y/any/System.Text.Encodings.Web.dll -+./sdk/x.y.z/DotnetTools/dotnet-user-jwts/x.y.z/tools/netx.y/any/System.Text.Json.dll - ./sdk/x.y.z/DotnetTools/dotnet-user-secrets/ - ./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/ - ./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/ -@@ ------------ @@ - ./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/Microsoft.Extensions.FileSystemGlobbing.dll - ./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/Microsoft.Extensions.Primitives.dll - ./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/Newtonsoft.Json.dll -+./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/runtimes/ -+./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/runtimes/browser/ -+./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/runtimes/browser/lib/ -+./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/runtimes/browser/lib/netx.y/ -+./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/runtimes/browser/lib/netx.y/System.Text.Encodings.Web.dll -+./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/System.Text.Encodings.Web.dll -+./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/System.Text.Json.dll - ./sdk/x.y.z/DotnetTools/dotnet-watch/ - ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/ - ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/ @@ ------------ @@ ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/Microsoft.CodeAnalysis.CSharp.Features.dll ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/Microsoft.CodeAnalysis.CSharp.Workspaces.dll @@ -169,26 +124,21 @@ index ------------ ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/middleware/Microsoft.AspNetCore.Watch.BrowserRefresh.dll ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/pl/ @@ ------------ @@ + ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/ru/Microsoft.CodeAnalysis.Workspaces.MSBuild.resources.dll ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/ru/Microsoft.CodeAnalysis.Workspaces.resources.dll ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/ru/System.CommandLine.resources.dll - ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/ +-./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/ -./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/unix/ -./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/unix/lib/ -./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/unix/lib/netx.y/ -./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/unix/lib/netx.y/System.Drawing.Common.dll -+./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/browser/ -+./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/browser/lib/ -+./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/browser/lib/netx.y/ -+./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/browser/lib/netx.y/System.Text.Encodings.Web.dll - ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/ - ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/lib/ - ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/lib/netx.y/ +-./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/ +-./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/lib/ +-./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/lib/netx.y/ -./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/lib/netx.y/Microsoft.Win32.SystemEvents.dll -./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/lib/netx.y/System.Drawing.Common.dll -./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/lib/netx.y/System.Security.Cryptography.ProtectedData.dll -./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/lib/netx.y/System.Windows.Extensions.dll -+./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/lib/netx.y/System.Text.Encoding.CodePages.dll -+./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Collections.Immutable.dll ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.CommandLine.dll ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Composition.AttributedModel.dll ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Composition.Convention.dll @@ -200,10 +150,6 @@ index ------------ -./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Security.Cryptography.ProtectedData.dll -./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Security.Permissions.dll -./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Windows.Extensions.dll -+./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Reflection.Metadata.dll -+./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Text.Encoding.CodePages.dll -+./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Text.Encodings.Web.dll -+./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Text.Json.dll ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/tr/ ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/tr/dotnet-watch.resources.dll ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/tr/Microsoft.CodeAnalysis.CSharp.Features.resources.dll @@ -259,21 +205,11 @@ index ------------ -./sdk/x.y.z/FSharp/runtimes/win/lib/netx.y/System.Security.Cryptography.ProtectedData.dll ./sdk/x.y.z/FSharp/runtimes/win/lib/netx.y/System.Windows.Extensions.dll ./sdk/x.y.z/FSharp/System.CodeDom.dll -+./sdk/x.y.z/FSharp/System.Collections.Immutable.dll ./sdk/x.y.z/FSharp/System.Configuration.ConfigurationManager.dll +./sdk/x.y.z/FSharp/System.Diagnostics.EventLog.dll ./sdk/x.y.z/FSharp/System.Drawing.Common.dll -+./sdk/x.y.z/FSharp/System.Formats.Asn1.dll -+./sdk/x.y.z/FSharp/System.Reflection.Metadata.dll ./sdk/x.y.z/FSharp/System.Resources.Extensions.dll ./sdk/x.y.z/FSharp/System.Security.Cryptography.Pkcs.dll - ./sdk/x.y.z/FSharp/System.Security.Cryptography.ProtectedData.dll - ./sdk/x.y.z/FSharp/System.Security.Cryptography.Xml.dll - ./sdk/x.y.z/FSharp/System.Security.Permissions.dll -+./sdk/x.y.z/FSharp/System.Threading.Tasks.Dataflow.dll - ./sdk/x.y.z/FSharp/System.Windows.Extensions.dll - ./sdk/x.y.z/FSharp/tr/ - ./sdk/x.y.z/FSharp/tr/FSharp.Build.resources.dll @@ ------------ @@ ./sdk/x.y.z/Microsoft.Build.NuGetSdkResolver.dll ./sdk/x.y.z/Microsoft.Build.Tasks.Core.dll @@ -329,13 +265,6 @@ index ------------ ./sdk/x.y.z/runtimes/win/lib/netx.y/Microsoft.Win32.SystemEvents.dll ./sdk/x.y.z/runtimes/win/lib/netx.y/System.Diagnostics.EventLog.dll ./sdk/x.y.z/runtimes/win/lib/netx.y/System.Diagnostics.EventLog.Messages.dll - ./sdk/x.y.z/runtimes/win/lib/netx.y/System.Drawing.Common.dll - ./sdk/x.y.z/runtimes/win/lib/netx.y/System.Security.Cryptography.Pkcs.dll - ./sdk/x.y.z/runtimes/win/lib/netx.y/System.ServiceProcess.ServiceController.dll -+./sdk/x.y.z/runtimes/win/lib/netx.y/System.Text.Encoding.CodePages.dll - ./sdk/x.y.z/runtimes/win/lib/netx.y/System.Windows.Extensions.dll - ./sdk/x.y.z/SDKPrecomputedAssemblyReferences.cache - ./sdk/x.y.z/SdkResolvers/ @@ ------------ @@ ./sdk/x.y.z/Sdks/Microsoft.NET.ILLink.Tasks/tools/net472/System.Buffers.dll ./sdk/x.y.z/Sdks/Microsoft.NET.ILLink.Tasks/tools/net472/System.Collections.Immutable.dll @@ -360,16 +289,6 @@ index ------------ ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Razor/tasks/net472/System.Reflection.Metadata.dll ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Razor/tasks/net472/System.Runtime.CompilerServices.Unsafe.dll ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Razor/tasks/net472/System.Text.Encodings.Web.dll -@@ ------------ @@ - ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Razor/tools/rzc.deps.json - ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Razor/tools/rzc.dll - ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Razor/tools/rzc.runtimeconfig.json -+./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Razor/tools/System.Collections.Immutable.dll -+./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Razor/tools/System.Reflection.Metadata.dll -+./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Razor/tools/System.Text.Encoding.CodePages.dll - ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Web.ProjectSystem/ - ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Web.ProjectSystem/Sdk/ - ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Web.ProjectSystem/Sdk/Sdk.props @@ ------------ @@ ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Web/tools/net472/Microsoft.NET.Sdk.Web.Tasks.dll ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Web/tools/netx.y/ @@ -387,28 +306,18 @@ index ------------ ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk/tools/net472/System.Runtime.CompilerServices.Unsafe.dll ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk/tools/net472/System.Text.Encodings.Web.dll @@ ------------ @@ - ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk/tools/netx.y/zh-Hant/Microsoft.NET.Build.Tasks.resources.dll ./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/ ./sdk/x.y.z/System.CodeDom.dll -+./sdk/x.y.z/System.Collections.Immutable.dll ./sdk/x.y.z/System.CommandLine.dll -./sdk/x.y.z/System.ComponentModel.Composition.dll ./sdk/x.y.z/System.Configuration.ConfigurationManager.dll ./sdk/x.y.z/System.Diagnostics.EventLog.dll ./sdk/x.y.z/System.Drawing.Common.dll -+./sdk/x.y.z/System.Formats.Asn1.dll -+./sdk/x.y.z/System.Reflection.Metadata.dll - ./sdk/x.y.z/System.Reflection.MetadataLoadContext.dll - ./sdk/x.y.z/System.Resources.Extensions.dll - ./sdk/x.y.z/System.Security.Cryptography.Pkcs.dll @@ ------------ @@ ./sdk/x.y.z/System.Security.Cryptography.Xml.dll ./sdk/x.y.z/System.Security.Permissions.dll ./sdk/x.y.z/System.ServiceProcess.ServiceController.dll -+./sdk/x.y.z/System.Text.Encoding.CodePages.dll +./sdk/x.y.z/System.Text.Encodings.Web.dll -+./sdk/x.y.z/System.Text.Json.dll -+./sdk/x.y.z/System.Threading.Tasks.Dataflow.dll ./sdk/x.y.z/System.Windows.Extensions.dll -./sdk/x.y.z/testhost-1.0.runtimeconfig.json -./sdk/x.y.z/testhost-1.1.runtimeconfig.json From cdfa6bad98831f759d3afd947f3de673579af434 Mon Sep 17 00:00:00 2001 From: Matt Thalman <Matt.Thalman@microsoft.com> Date: Thu, 10 Aug 2023 19:58:12 +0000 Subject: [PATCH 06/17] Merged PR 33071: Update 7.0 SDK diff Update MSFT to SB SDK diff baseline --- .../assets/baselines/MsftToSbSdk.diff | 101 +++++++++++++++++- 1 file changed, 96 insertions(+), 5 deletions(-) diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdk.diff b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdk.diff index bd443698c..4d662a3c3 100644 --- a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdk.diff +++ b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdk.diff @@ -14,7 +14,23 @@ index ------------ ./packs/Microsoft.AspNetCore.App.Ref/ ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ @@ ------------ @@ + ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/Microsoft.JSInterop.xml + ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/Microsoft.Net.Http.Headers.dll + ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/Microsoft.Net.Http.Headers.xml ++./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Diagnostics.DiagnosticSource.dll ++./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Diagnostics.DiagnosticSource.xml + ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Diagnostics.EventLog.dll + ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Diagnostics.EventLog.xml ++./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Formats.Asn1.dll ++./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Formats.Asn1.xml + ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.IO.Pipelines.dll + ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.IO.Pipelines.xml + ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Security.Cryptography.Xml.dll ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Security.Cryptography.Xml.xml ++./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Text.Encodings.Web.dll ++./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Text.Encodings.Web.xml ++./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Text.Json.dll ++./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Text.Json.xml ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Threading.RateLimiting.dll ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Threading.RateLimiting.xml -./packs/Microsoft.NETCore.App.Host.portable-rid/ @@ -109,6 +125,35 @@ index ------------ ./sdk/x.y.z/DotnetTools/dotnet-format/tr/ ./sdk/x.y.z/DotnetTools/dotnet-format/tr/dotnet-format.resources.dll ./sdk/x.y.z/DotnetTools/dotnet-format/tr/Microsoft.CodeAnalysis.CSharp.Features.resources.dll +@@ ------------ @@ + ./sdk/x.y.z/DotnetTools/dotnet-user-jwts/x.y.z/tools/netx.y/any/Microsoft.IdentityModel.JsonWebTokens.dll + ./sdk/x.y.z/DotnetTools/dotnet-user-jwts/x.y.z/tools/netx.y/any/Microsoft.IdentityModel.Logging.dll + ./sdk/x.y.z/DotnetTools/dotnet-user-jwts/x.y.z/tools/netx.y/any/Microsoft.IdentityModel.Tokens.dll ++./sdk/x.y.z/DotnetTools/dotnet-user-jwts/x.y.z/tools/netx.y/any/runtimes/ ++./sdk/x.y.z/DotnetTools/dotnet-user-jwts/x.y.z/tools/netx.y/any/runtimes/browser/ ++./sdk/x.y.z/DotnetTools/dotnet-user-jwts/x.y.z/tools/netx.y/any/runtimes/browser/lib/ ++./sdk/x.y.z/DotnetTools/dotnet-user-jwts/x.y.z/tools/netx.y/any/runtimes/browser/lib/netx.y/ ++./sdk/x.y.z/DotnetTools/dotnet-user-jwts/x.y.z/tools/netx.y/any/runtimes/browser/lib/netx.y/System.Text.Encodings.Web.dll + ./sdk/x.y.z/DotnetTools/dotnet-user-jwts/x.y.z/tools/netx.y/any/System.IdentityModel.Tokens.Jwt.dll ++./sdk/x.y.z/DotnetTools/dotnet-user-jwts/x.y.z/tools/netx.y/any/System.Text.Encodings.Web.dll ++./sdk/x.y.z/DotnetTools/dotnet-user-jwts/x.y.z/tools/netx.y/any/System.Text.Json.dll + ./sdk/x.y.z/DotnetTools/dotnet-user-secrets/ + ./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/ + ./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/ +@@ ------------ @@ + ./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/Microsoft.Extensions.FileSystemGlobbing.dll + ./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/Microsoft.Extensions.Primitives.dll + ./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/Newtonsoft.Json.dll ++./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/runtimes/ ++./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/runtimes/browser/ ++./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/runtimes/browser/lib/ ++./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/runtimes/browser/lib/netx.y/ ++./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/runtimes/browser/lib/netx.y/System.Text.Encodings.Web.dll ++./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/System.Text.Encodings.Web.dll ++./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/System.Text.Json.dll + ./sdk/x.y.z/DotnetTools/dotnet-watch/ + ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/ + ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/ @@ ------------ @@ ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/Microsoft.CodeAnalysis.CSharp.Features.dll ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/Microsoft.CodeAnalysis.CSharp.Workspaces.dll @@ -124,21 +169,26 @@ index ------------ ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/middleware/Microsoft.AspNetCore.Watch.BrowserRefresh.dll ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/pl/ @@ ------------ @@ - ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/ru/Microsoft.CodeAnalysis.Workspaces.MSBuild.resources.dll ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/ru/Microsoft.CodeAnalysis.Workspaces.resources.dll ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/ru/System.CommandLine.resources.dll --./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/ + ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/ -./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/unix/ -./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/unix/lib/ -./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/unix/lib/netx.y/ -./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/unix/lib/netx.y/System.Drawing.Common.dll --./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/ --./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/lib/ --./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/lib/netx.y/ ++./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/browser/ ++./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/browser/lib/ ++./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/browser/lib/netx.y/ ++./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/browser/lib/netx.y/System.Text.Encodings.Web.dll + ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/ + ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/lib/ + ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/lib/netx.y/ -./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/lib/netx.y/Microsoft.Win32.SystemEvents.dll -./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/lib/netx.y/System.Drawing.Common.dll -./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/lib/netx.y/System.Security.Cryptography.ProtectedData.dll -./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/lib/netx.y/System.Windows.Extensions.dll ++./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/lib/netx.y/System.Text.Encoding.CodePages.dll ++./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Collections.Immutable.dll ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.CommandLine.dll ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Composition.AttributedModel.dll ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Composition.Convention.dll @@ -150,6 +200,10 @@ index ------------ -./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Security.Cryptography.ProtectedData.dll -./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Security.Permissions.dll -./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Windows.Extensions.dll ++./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Reflection.Metadata.dll ++./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Text.Encoding.CodePages.dll ++./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Text.Encodings.Web.dll ++./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Text.Json.dll ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/tr/ ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/tr/dotnet-watch.resources.dll ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/tr/Microsoft.CodeAnalysis.CSharp.Features.resources.dll @@ -205,11 +259,21 @@ index ------------ -./sdk/x.y.z/FSharp/runtimes/win/lib/netx.y/System.Security.Cryptography.ProtectedData.dll ./sdk/x.y.z/FSharp/runtimes/win/lib/netx.y/System.Windows.Extensions.dll ./sdk/x.y.z/FSharp/System.CodeDom.dll ++./sdk/x.y.z/FSharp/System.Collections.Immutable.dll ./sdk/x.y.z/FSharp/System.Configuration.ConfigurationManager.dll +./sdk/x.y.z/FSharp/System.Diagnostics.EventLog.dll ./sdk/x.y.z/FSharp/System.Drawing.Common.dll ++./sdk/x.y.z/FSharp/System.Formats.Asn1.dll ++./sdk/x.y.z/FSharp/System.Reflection.Metadata.dll ./sdk/x.y.z/FSharp/System.Resources.Extensions.dll ./sdk/x.y.z/FSharp/System.Security.Cryptography.Pkcs.dll + ./sdk/x.y.z/FSharp/System.Security.Cryptography.ProtectedData.dll + ./sdk/x.y.z/FSharp/System.Security.Cryptography.Xml.dll + ./sdk/x.y.z/FSharp/System.Security.Permissions.dll ++./sdk/x.y.z/FSharp/System.Threading.Tasks.Dataflow.dll + ./sdk/x.y.z/FSharp/System.Windows.Extensions.dll + ./sdk/x.y.z/FSharp/tr/ + ./sdk/x.y.z/FSharp/tr/FSharp.Build.resources.dll @@ ------------ @@ ./sdk/x.y.z/Microsoft.Build.NuGetSdkResolver.dll ./sdk/x.y.z/Microsoft.Build.Tasks.Core.dll @@ -265,6 +329,13 @@ index ------------ ./sdk/x.y.z/runtimes/win/lib/netx.y/Microsoft.Win32.SystemEvents.dll ./sdk/x.y.z/runtimes/win/lib/netx.y/System.Diagnostics.EventLog.dll ./sdk/x.y.z/runtimes/win/lib/netx.y/System.Diagnostics.EventLog.Messages.dll + ./sdk/x.y.z/runtimes/win/lib/netx.y/System.Drawing.Common.dll + ./sdk/x.y.z/runtimes/win/lib/netx.y/System.Security.Cryptography.Pkcs.dll + ./sdk/x.y.z/runtimes/win/lib/netx.y/System.ServiceProcess.ServiceController.dll ++./sdk/x.y.z/runtimes/win/lib/netx.y/System.Text.Encoding.CodePages.dll + ./sdk/x.y.z/runtimes/win/lib/netx.y/System.Windows.Extensions.dll + ./sdk/x.y.z/SDKPrecomputedAssemblyReferences.cache + ./sdk/x.y.z/SdkResolvers/ @@ ------------ @@ ./sdk/x.y.z/Sdks/Microsoft.NET.ILLink.Tasks/tools/net472/System.Buffers.dll ./sdk/x.y.z/Sdks/Microsoft.NET.ILLink.Tasks/tools/net472/System.Collections.Immutable.dll @@ -289,6 +360,16 @@ index ------------ ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Razor/tasks/net472/System.Reflection.Metadata.dll ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Razor/tasks/net472/System.Runtime.CompilerServices.Unsafe.dll ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Razor/tasks/net472/System.Text.Encodings.Web.dll +@@ ------------ @@ + ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Razor/tools/rzc.deps.json + ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Razor/tools/rzc.dll + ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Razor/tools/rzc.runtimeconfig.json ++./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Razor/tools/System.Collections.Immutable.dll ++./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Razor/tools/System.Reflection.Metadata.dll ++./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Razor/tools/System.Text.Encoding.CodePages.dll + ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Web.ProjectSystem/ + ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Web.ProjectSystem/Sdk/ + ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Web.ProjectSystem/Sdk/Sdk.props @@ ------------ @@ ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Web/tools/net472/Microsoft.NET.Sdk.Web.Tasks.dll ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Web/tools/netx.y/ @@ -306,18 +387,28 @@ index ------------ ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk/tools/net472/System.Runtime.CompilerServices.Unsafe.dll ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk/tools/net472/System.Text.Encodings.Web.dll @@ ------------ @@ + ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk/tools/netx.y/zh-Hant/Microsoft.NET.Build.Tasks.resources.dll ./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/ ./sdk/x.y.z/System.CodeDom.dll ++./sdk/x.y.z/System.Collections.Immutable.dll ./sdk/x.y.z/System.CommandLine.dll -./sdk/x.y.z/System.ComponentModel.Composition.dll ./sdk/x.y.z/System.Configuration.ConfigurationManager.dll ./sdk/x.y.z/System.Diagnostics.EventLog.dll ./sdk/x.y.z/System.Drawing.Common.dll ++./sdk/x.y.z/System.Formats.Asn1.dll ++./sdk/x.y.z/System.Reflection.Metadata.dll + ./sdk/x.y.z/System.Reflection.MetadataLoadContext.dll + ./sdk/x.y.z/System.Resources.Extensions.dll + ./sdk/x.y.z/System.Security.Cryptography.Pkcs.dll @@ ------------ @@ ./sdk/x.y.z/System.Security.Cryptography.Xml.dll ./sdk/x.y.z/System.Security.Permissions.dll ./sdk/x.y.z/System.ServiceProcess.ServiceController.dll ++./sdk/x.y.z/System.Text.Encoding.CodePages.dll +./sdk/x.y.z/System.Text.Encodings.Web.dll ++./sdk/x.y.z/System.Text.Json.dll ++./sdk/x.y.z/System.Threading.Tasks.Dataflow.dll ./sdk/x.y.z/System.Windows.Extensions.dll -./sdk/x.y.z/testhost-1.0.runtimeconfig.json -./sdk/x.y.z/testhost-1.1.runtimeconfig.json From 1d2de9a0d7509be3068c77af3253279f49bdbd9d Mon Sep 17 00:00:00 2001 From: DotNet-Bot <dn-bot@microsoft.com> Date: Wed, 16 Aug 2023 23:27:45 +0000 Subject: [PATCH 07/17] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230816.54 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.110 -> To Version 7.0.111 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,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.7.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,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100 From Version 7.0.10 -> To Version 7.0.11 (parent: Microsoft.NET.Sdk --- NuGet.config | 29 ++++-------- eng/Version.Details.xml | 100 ++++++++++++++++++++-------------------- eng/Versions.props | 48 +++++++++---------- 3 files changed, 83 insertions(+), 94 deletions(-) diff --git a/NuGet.config b/NuGet.config index 2bc601a50..feca935bf 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,29 +7,22 @@ <clear /> <!--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-5a4c82e" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-5a4c82ec/nuget/v3/index.json" /> - <add key="darc-int-dotnet-aspnetcore-5a4c82e-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-5a4c82ec-3/nuget/v3/index.json" /> - <add key="darc-int-dotnet-aspnetcore-5a4c82e-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-5a4c82ec-2/nuget/v3/index.json" /> - <add key="darc-int-dotnet-aspnetcore-5a4c82e-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-5a4c82ec-1/nuget/v3/index.json" /> + <add key="darc-int-dotnet-aspnetcore-29b2328" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-29b23288/nuget/v3/index.json" /> <!-- End: Package sources from dotnet-aspnetcore --> <!-- Begin: Package sources from dotnet-emsdk --> - <add key="darc-pub-dotnet-emsdk-96ba1fe" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-96ba1fed/nuget/v3/index.json" /> - <add key="darc-pub-dotnet-emsdk-96ba1fe-3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-96ba1fed-3/nuget/v3/index.json" /> - <add key="darc-pub-dotnet-emsdk-96ba1fe-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-96ba1fed-2/nuget/v3/index.json" /> - <add key="darc-pub-dotnet-emsdk-96ba1fe-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-96ba1fed-1/nuget/v3/index.json" /> + <add key="darc-pub-dotnet-emsdk-fcd8602" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-fcd86021/nuget/v3/index.json" /> <!-- End: Package sources from dotnet-emsdk --> <!-- Begin: Package sources from DotNet-msbuild-Trusted --> <add key="darc-pub-DotNet-msbuild-Trusted-6918b86" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-6918b863/nuget/v3/index.json" /> <!-- End: Package sources from DotNet-msbuild-Trusted --> <!-- Begin: Package sources from dotnet-runtime --> + <add key="darc-int-dotnet-runtime-de78412" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-de784122/nuget/v3/index.json" /> <!-- End: Package sources from dotnet-runtime --> <!-- Begin: Package sources from dotnet-sdk --> + <add key="darc-int-dotnet-sdk-142937b" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-142937b3/nuget/v3/index.json" /> <!-- End: Package sources from dotnet-sdk --> <!-- Begin: Package sources from dotnet-windowsdesktop --> - <add key="darc-int-dotnet-windowsdesktop-996ed6b" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-996ed6b0/nuget/v3/index.json" /> - <add key="darc-int-dotnet-windowsdesktop-996ed6b-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-996ed6b0-3/nuget/v3/index.json" /> - <add key="darc-int-dotnet-windowsdesktop-996ed6b-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-996ed6b0-2/nuget/v3/index.json" /> - <add key="darc-int-dotnet-windowsdesktop-996ed6b-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-996ed6b0-1/nuget/v3/index.json" /> + <add key="darc-int-dotnet-windowsdesktop-c9f28c6" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-c9f28c6a/nuget/v3/index.json" /> <!-- End: Package sources from dotnet-windowsdesktop --> <!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.--> <add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" /> @@ -51,19 +44,15 @@ <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-5a4c82e-1" value="true" /> - <add key="darc-int-dotnet-aspnetcore-5a4c82e-2" value="true" /> - <add key="darc-int-dotnet-aspnetcore-5a4c82e-3" value="true" /> - <add key="darc-int-dotnet-aspnetcore-5a4c82e" value="true" /> + <add key="darc-int-dotnet-aspnetcore-29b2328" value="true" /> <!-- End: Package sources from dotnet-aspnetcore --> <!-- Begin: Package sources from dotnet-runtime --> + <add key="darc-int-dotnet-runtime-de78412" value="true" /> <!-- Begin: Package sources from dotnet-sdk --> + <add key="darc-int-dotnet-sdk-142937b" value="true" /> <!-- End: Package sources from dotnet-sdk --> <!-- Begin: Package sources from dotnet-windowsdesktop --> - <add key="darc-int-dotnet-windowsdesktop-996ed6b-1" value="true" /> - <add key="darc-int-dotnet-windowsdesktop-996ed6b-2" value="true" /> - <add key="darc-int-dotnet-windowsdesktop-996ed6b-3" value="true" /> - <add key="darc-int-dotnet-windowsdesktop-996ed6b" value="true" /> + <add key="darc-int-dotnet-windowsdesktop-c9f28c6" value="true" /> <!-- End: Package sources from dotnet-windowsdesktop --> <!-- End: Package sources from dotnet-runtime --> <!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.--> diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 41f0b6154..fd0c58a2e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ <?xml version="1.0" encoding="utf-8"?> <Dependencies> <ProductDependencies> - <Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="7.0.10" CoherentParentDependency="Microsoft.NET.Sdk"> + <Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="7.0.11" CoherentParentDependency="Microsoft.NET.Sdk"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri> - <Sha>996ed6b07099f377a6b05581860a1f66a30aca00</Sha> + <Sha>c9f28c6a29182e54d1c292d1cff9778315cee51c</Sha> </Dependency> - <Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0" Version="7.0.10-servicing.23367.2" CoherentParentDependency="Microsoft.NET.Sdk"> + <Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0" Version="7.0.11-servicing.23416.8" CoherentParentDependency="Microsoft.NET.Sdk"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri> - <Sha>996ed6b07099f377a6b05581860a1f66a30aca00</Sha> + <Sha>c9f28c6a29182e54d1c292d1cff9778315cee51c</Sha> </Dependency> - <Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0" Version="7.0.10-servicing.23367.2" CoherentParentDependency="Microsoft.NET.Sdk"> + <Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0" Version="7.0.11-servicing.23416.8" CoherentParentDependency="Microsoft.NET.Sdk"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri> - <Sha>996ed6b07099f377a6b05581860a1f66a30aca00</Sha> + <Sha>c9f28c6a29182e54d1c292d1cff9778315cee51c</Sha> </Dependency> - <Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="7.0.10" CoherentParentDependency="Microsoft.NET.Sdk"> + <Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="7.0.11" CoherentParentDependency="Microsoft.NET.Sdk"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri> - <Sha>996ed6b07099f377a6b05581860a1f66a30aca00</Sha> + <Sha>c9f28c6a29182e54d1c292d1cff9778315cee51c</Sha> </Dependency> - <Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.7.0" Version="7.0.10-servicing.23363.12" CoherentParentDependency="Microsoft.NET.Sdk"> + <Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.7.0" Version="7.0.11-servicing.23415.17" CoherentParentDependency="Microsoft.NET.Sdk"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> - <Sha>a6dbb800a47735bde43187350fd3aff4071c7f9c</Sha> + <Sha>de7841221e4ad56750e452db8ac4eab459b2ab23</Sha> </Dependency> - <Dependency Name="Microsoft.NETCore.App.Ref" Version="7.0.10" CoherentParentDependency="Microsoft.NET.Sdk"> + <Dependency Name="Microsoft.NETCore.App.Ref" Version="7.0.11" CoherentParentDependency="Microsoft.NET.Sdk"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> - <Sha>a6dbb800a47735bde43187350fd3aff4071c7f9c</Sha> + <Sha>de7841221e4ad56750e452db8ac4eab459b2ab23</Sha> </Dependency> - <Dependency Name="VS.Redist.Common.NetCore.TargetingPack.x64.7.0" Version="7.0.10-servicing.23363.12" CoherentParentDependency="Microsoft.NET.Sdk"> + <Dependency Name="VS.Redist.Common.NetCore.TargetingPack.x64.7.0" Version="7.0.11-servicing.23415.17" CoherentParentDependency="Microsoft.NET.Sdk"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> - <Sha>a6dbb800a47735bde43187350fd3aff4071c7f9c</Sha> + <Sha>de7841221e4ad56750e452db8ac4eab459b2ab23</Sha> </Dependency> - <Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="7.0.10" CoherentParentDependency="Microsoft.NET.Sdk"> + <Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="7.0.11" CoherentParentDependency="Microsoft.NET.Sdk"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> - <Sha>a6dbb800a47735bde43187350fd3aff4071c7f9c</Sha> + <Sha>de7841221e4ad56750e452db8ac4eab459b2ab23</Sha> <SourceBuildTarball RepoName="runtime" ManagedOnly="true" /> </Dependency> - <Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="7.0.10" CoherentParentDependency="Microsoft.NET.Sdk"> + <Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="7.0.11" CoherentParentDependency="Microsoft.NET.Sdk"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> - <Sha>a6dbb800a47735bde43187350fd3aff4071c7f9c</Sha> + <Sha>de7841221e4ad56750e452db8ac4eab459b2ab23</Sha> </Dependency> - <Dependency Name="Microsoft.NETCore.DotNetHostResolver" Version="7.0.10" CoherentParentDependency="Microsoft.NET.Sdk"> + <Dependency Name="Microsoft.NETCore.DotNetHostResolver" Version="7.0.11" CoherentParentDependency="Microsoft.NET.Sdk"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> - <Sha>a6dbb800a47735bde43187350fd3aff4071c7f9c</Sha> + <Sha>de7841221e4ad56750e452db8ac4eab459b2ab23</Sha> </Dependency> <!-- Change blob version in GenerateLayout.targets if this is unpinned to service targeting pack --> <!-- No new netstandard.library planned for 3.1 timeframe at this time. --> @@ -52,34 +52,34 @@ <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> <Sha>8e9a17b2216f51a5788f8b1c467a4cf3b769e7d7</Sha> </Dependency> - <Dependency Name="Microsoft.AspNetCore.App.Ref" Version="7.0.10" CoherentParentDependency="Microsoft.NET.Sdk"> + <Dependency Name="Microsoft.AspNetCore.App.Ref" Version="7.0.11" CoherentParentDependency="Microsoft.NET.Sdk"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri> - <Sha>5a4c82ec57fadddef9ce841d608de5c7c8c74446</Sha> + <Sha>29b232880d00408f61601fd63a87d54784dde835</Sha> </Dependency> - <Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="7.0.10-servicing.23364.39" CoherentParentDependency="Microsoft.NET.Sdk"> + <Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="7.0.11-servicing.23416.1" CoherentParentDependency="Microsoft.NET.Sdk"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri> - <Sha>5a4c82ec57fadddef9ce841d608de5c7c8c74446</Sha> + <Sha>29b232880d00408f61601fd63a87d54784dde835</Sha> <SourceBuild RepoName="aspnetcore" ManagedOnly="true" /> </Dependency> - <Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="7.0.10" CoherentParentDependency="Microsoft.NET.Sdk"> + <Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="7.0.11" CoherentParentDependency="Microsoft.NET.Sdk"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri> - <Sha>5a4c82ec57fadddef9ce841d608de5c7c8c74446</Sha> + <Sha>29b232880d00408f61601fd63a87d54784dde835</Sha> </Dependency> - <Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0" Version="7.0.10-servicing.23364.39" CoherentParentDependency="Microsoft.NET.Sdk"> + <Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0" Version="7.0.11-servicing.23416.1" CoherentParentDependency="Microsoft.NET.Sdk"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri> - <Sha>5a4c82ec57fadddef9ce841d608de5c7c8c74446</Sha> + <Sha>29b232880d00408f61601fd63a87d54784dde835</Sha> </Dependency> - <Dependency Name="dotnet-dev-certs" Version="7.0.10-servicing.23364.39" CoherentParentDependency="Microsoft.NET.Sdk"> + <Dependency Name="dotnet-dev-certs" Version="7.0.11-servicing.23416.1" CoherentParentDependency="Microsoft.NET.Sdk"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri> - <Sha>5a4c82ec57fadddef9ce841d608de5c7c8c74446</Sha> + <Sha>29b232880d00408f61601fd63a87d54784dde835</Sha> </Dependency> - <Dependency Name="dotnet-user-jwts" Version="7.0.10-servicing.23364.39" CoherentParentDependency="Microsoft.NET.Sdk"> + <Dependency Name="dotnet-user-jwts" Version="7.0.11-servicing.23416.1" CoherentParentDependency="Microsoft.NET.Sdk"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri> - <Sha>5a4c82ec57fadddef9ce841d608de5c7c8c74446</Sha> + <Sha>29b232880d00408f61601fd63a87d54784dde835</Sha> </Dependency> - <Dependency Name="dotnet-user-secrets" Version="7.0.10-servicing.23364.39" CoherentParentDependency="Microsoft.NET.Sdk"> + <Dependency Name="dotnet-user-secrets" Version="7.0.11-servicing.23416.1" CoherentParentDependency="Microsoft.NET.Sdk"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri> - <Sha>5a4c82ec57fadddef9ce841d608de5c7c8c74446</Sha> + <Sha>29b232880d00408f61601fd63a87d54784dde835</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> @@ -98,31 +98,31 @@ <Sha>aaaa0c1826f97a9dfcc67e94136bf01010b55f23</Sha> <SourceBuild RepoName="test-templates" ManagedOnly="true" /> </Dependency> - <Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="7.0.110"> + <Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="7.0.111"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri> - <Sha>82f22c431bb683309ba75d749d920ae8ffb06c02</Sha> + <Sha>142937b396f99e3331d8b9fa3c529e6169a7405f</Sha> </Dependency> - <Dependency Name="Microsoft.TemplateEngine.Cli" Version="7.0.110-servicing.23367.22"> + <Dependency Name="Microsoft.TemplateEngine.Cli" Version="7.0.111-servicing.23416.54"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri> - <Sha>82f22c431bb683309ba75d749d920ae8ffb06c02</Sha> + <Sha>142937b396f99e3331d8b9fa3c529e6169a7405f</Sha> </Dependency> - <Dependency Name="Microsoft.NET.Sdk" Version="7.0.110-servicing.23367.22"> + <Dependency Name="Microsoft.NET.Sdk" Version="7.0.111-servicing.23416.54"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri> - <Sha>82f22c431bb683309ba75d749d920ae8ffb06c02</Sha> + <Sha>142937b396f99e3331d8b9fa3c529e6169a7405f</Sha> <SourceBuild RepoName="sdk" ManagedOnly="true" /> </Dependency> - <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="7.0.110-servicing.23367.22"> + <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="7.0.111-servicing.23416.54"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri> - <Sha>82f22c431bb683309ba75d749d920ae8ffb06c02</Sha> + <Sha>142937b396f99e3331d8b9fa3c529e6169a7405f</Sha> </Dependency> <!-- For coherency purposes, these versions should be gated by the versions of winforms and wpf routed via windowsdesktop --> - <Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="7.0.10-servicing.23364.5" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64"> + <Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="7.0.11-servicing.23416.5" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-winforms</Uri> - <Sha>1f1ac283c5d3bb3302111f8aef567a3541863c49</Sha> + <Sha>639189647d647da4008fa57fd63b1d415c84b487</Sha> </Dependency> - <Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="7.0.10-servicing.23364.4" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64"> + <Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="7.0.11-servicing.23416.7" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri> - <Sha>9a9892f5204f1a1b31ab2c81b025d6e35e0f3693</Sha> + <Sha>8037dc673134da614f02f4b84f6a9a61e047ae60</Sha> </Dependency> <Dependency Name="Microsoft.FSharp.Compiler" Version="12.4.0-beta.22571.5" CoherentParentDependency="Microsoft.NET.Sdk"> <Uri>https://github.com/dotnet/fsharp</Uri> @@ -163,13 +163,13 @@ <Uri>https://github.com/Microsoft/ApplicationInsights-dotnet</Uri> <Sha>53b80940842204f78708a538628288ff5d741a1d</Sha> </Dependency> - <Dependency Name="Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100" Version="7.0.10" CoherentParentDependency="VS.Redist.Common.NetCore.SharedFramework.x64.7.0"> + <Dependency Name="Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100" Version="7.0.11" CoherentParentDependency="VS.Redist.Common.NetCore.SharedFramework.x64.7.0"> <Uri>https://github.com/dotnet/emsdk</Uri> - <Sha>96ba1fedbcfb742d0d154532f6ac3c30d14a5f7d</Sha> + <Sha>fcd8602188cfe2f73c73f5ae57e33c0654ce9858</Sha> </Dependency> - <Dependency Name="Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100" Version="7.0.10" CoherentParentDependency="VS.Redist.Common.NetCore.SharedFramework.x64.7.0"> + <Dependency Name="Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100" Version="7.0.11" CoherentParentDependency="VS.Redist.Common.NetCore.SharedFramework.x64.7.0"> <Uri>https://github.com/dotnet/emsdk</Uri> - <Sha>96ba1fedbcfb742d0d154532f6ac3c30d14a5f7d</Sha> + <Sha>fcd8602188cfe2f73c73f5ae57e33c0654ce9858</Sha> </Dependency> <Dependency Name="Microsoft.Deployment.DotNet.Releases" Version="1.0.0-preview5.1.22263.1"> <Uri>https://github.com/dotnet/deployment-tools</Uri> diff --git a/eng/Versions.props b/eng/Versions.props index f9f9cd5e4..cc9d7ddb2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,11 +37,11 @@ </PropertyGroup> <PropertyGroup> <!-- Dependency from https://github.com/dotnet/winforms --> - <MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>7.0.10-servicing.23364.5</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion> + <MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>7.0.11-servicing.23416.5</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion> </PropertyGroup> <PropertyGroup> <!-- Dependency from https://github.com/dotnet/wpf --> - <MicrosoftDotNetWpfProjectTemplatesPackageVersion>7.0.10-servicing.23364.4</MicrosoftDotNetWpfProjectTemplatesPackageVersion> + <MicrosoftDotNetWpfProjectTemplatesPackageVersion>7.0.11-servicing.23416.7</MicrosoftDotNetWpfProjectTemplatesPackageVersion> </PropertyGroup> <PropertyGroup> <!-- Dependency from https://github.com/dotnet/test-templates --> @@ -56,22 +56,22 @@ </PropertyGroup> <PropertyGroup> <!-- Dependencies from https://github.com/aspnet/AspNetCore --> - <MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>7.0.10</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion> - <MicrosoftAspNetCoreAppRefPackageVersion>7.0.10</MicrosoftAspNetCoreAppRefPackageVersion> - <MicrosoftAspNetCoreAppRefInternalPackageVersion>7.0.10-servicing.23364.39</MicrosoftAspNetCoreAppRefInternalPackageVersion> - <VSRedistCommonAspNetCoreSharedFrameworkx6470PackageVersion>7.0.10-servicing.23364.39</VSRedistCommonAspNetCoreSharedFrameworkx6470PackageVersion> - <dotnetdevcertsPackageVersion>7.0.10-servicing.23364.39</dotnetdevcertsPackageVersion> - <dotnetuserjwtsPackageVersion>7.0.10-servicing.23364.39</dotnetuserjwtsPackageVersion> - <dotnetusersecretsPackageVersion>7.0.10-servicing.23364.39</dotnetusersecretsPackageVersion> + <MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>7.0.11</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion> + <MicrosoftAspNetCoreAppRefPackageVersion>7.0.11</MicrosoftAspNetCoreAppRefPackageVersion> + <MicrosoftAspNetCoreAppRefInternalPackageVersion>7.0.11-servicing.23416.1</MicrosoftAspNetCoreAppRefInternalPackageVersion> + <VSRedistCommonAspNetCoreSharedFrameworkx6470PackageVersion>7.0.11-servicing.23416.1</VSRedistCommonAspNetCoreSharedFrameworkx6470PackageVersion> + <dotnetdevcertsPackageVersion>7.0.11-servicing.23416.1</dotnetdevcertsPackageVersion> + <dotnetuserjwtsPackageVersion>7.0.11-servicing.23416.1</dotnetuserjwtsPackageVersion> + <dotnetusersecretsPackageVersion>7.0.11-servicing.23416.1</dotnetusersecretsPackageVersion> </PropertyGroup> <PropertyGroup> <MicroBuildCorePackageVersion>0.2.0</MicroBuildCorePackageVersion> </PropertyGroup> <PropertyGroup> <!-- Dependencies from https://github.com/dotnet/sdk --> - <MicrosoftDotNetCommonItemTemplatesPackageVersion>7.0.110</MicrosoftDotNetCommonItemTemplatesPackageVersion> - <MicrosoftNETSdkPackageVersion>7.0.110-servicing.23367.22</MicrosoftNETSdkPackageVersion> - <MicrosoftDotNetMSBuildSdkResolverPackageVersion>7.0.110-servicing.23367.22</MicrosoftDotNetMSBuildSdkResolverPackageVersion> + <MicrosoftDotNetCommonItemTemplatesPackageVersion>7.0.111</MicrosoftDotNetCommonItemTemplatesPackageVersion> + <MicrosoftNETSdkPackageVersion>7.0.111-servicing.23416.54</MicrosoftNETSdkPackageVersion> + <MicrosoftDotNetMSBuildSdkResolverPackageVersion>7.0.111-servicing.23416.54</MicrosoftDotNetMSBuildSdkResolverPackageVersion> <MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion> <MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion> <MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion> @@ -82,20 +82,20 @@ </PropertyGroup> <PropertyGroup> <!-- Dependencies from https://github.com/dotnet/core-setup --> - <VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion>7.0.10-servicing.23363.12</VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion> - <VSRedistCommonNetCoreTargetingPackx6470PackageVersion>7.0.10-servicing.23363.12</VSRedistCommonNetCoreTargetingPackx6470PackageVersion> - <MicrosoftNETCoreAppRuntimewinx64PackageVersion>7.0.10</MicrosoftNETCoreAppRuntimewinx64PackageVersion> - <MicrosoftNETCoreAppHostwinx64PackageVersion>7.0.10</MicrosoftNETCoreAppHostwinx64PackageVersion> - <MicrosoftNETCoreAppRefPackageVersion>7.0.10</MicrosoftNETCoreAppRefPackageVersion> - <MicrosoftNETCoreDotNetHostResolverPackageVersion>7.0.10</MicrosoftNETCoreDotNetHostResolverPackageVersion> + <VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion>7.0.11-servicing.23415.17</VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion> + <VSRedistCommonNetCoreTargetingPackx6470PackageVersion>7.0.11-servicing.23415.17</VSRedistCommonNetCoreTargetingPackx6470PackageVersion> + <MicrosoftNETCoreAppRuntimewinx64PackageVersion>7.0.11</MicrosoftNETCoreAppRuntimewinx64PackageVersion> + <MicrosoftNETCoreAppHostwinx64PackageVersion>7.0.11</MicrosoftNETCoreAppHostwinx64PackageVersion> + <MicrosoftNETCoreAppRefPackageVersion>7.0.11</MicrosoftNETCoreAppRefPackageVersion> + <MicrosoftNETCoreDotNetHostResolverPackageVersion>7.0.11</MicrosoftNETCoreDotNetHostResolverPackageVersion> <NETStandardLibraryRefPackageVersion>2.1.0</NETStandardLibraryRefPackageVersion> </PropertyGroup> <PropertyGroup> <!-- Dependencies from https://github.com/dotnet/windowsdesktop --> - <VSRedistCommonWindowsDesktopSharedFrameworkx6470PackageVersion>7.0.10-servicing.23367.2</VSRedistCommonWindowsDesktopSharedFrameworkx6470PackageVersion> - <VSRedistCommonWindowsDesktopTargetingPackx6470PackageVersion>7.0.10-servicing.23367.2</VSRedistCommonWindowsDesktopTargetingPackx6470PackageVersion> - <MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>7.0.10</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion> - <MicrosoftWindowsDesktopAppRefPackageVersion>7.0.10</MicrosoftWindowsDesktopAppRefPackageVersion> + <VSRedistCommonWindowsDesktopSharedFrameworkx6470PackageVersion>7.0.11-servicing.23416.8</VSRedistCommonWindowsDesktopSharedFrameworkx6470PackageVersion> + <VSRedistCommonWindowsDesktopTargetingPackx6470PackageVersion>7.0.11-servicing.23416.8</VSRedistCommonWindowsDesktopTargetingPackx6470PackageVersion> + <MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>7.0.11</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion> + <MicrosoftWindowsDesktopAppRefPackageVersion>7.0.11</MicrosoftWindowsDesktopAppRefPackageVersion> </PropertyGroup> <PropertyGroup> <!-- Runtime and Apphost pack versions are the same for all RIDs. We flow the x64 --> @@ -228,8 +228,8 @@ <XamarinMacOSWorkloadManifestVersion>12.3.2372</XamarinMacOSWorkloadManifestVersion> <XamarinTvOSWorkloadManifestVersion>16.0.1478</XamarinTvOSWorkloadManifestVersion> <MonoWorkloadManifestVersion>$(MicrosoftNETCoreAppRefPackageVersion)</MonoWorkloadManifestVersion> - <MicrosoftNETWorkloadEmscriptennet6Manifest70100Version>7.0.10</MicrosoftNETWorkloadEmscriptennet6Manifest70100Version> - <MicrosoftNETWorkloadEmscriptennet7Manifest70100Version>7.0.10</MicrosoftNETWorkloadEmscriptennet7Manifest70100Version> + <MicrosoftNETWorkloadEmscriptennet6Manifest70100Version>7.0.11</MicrosoftNETWorkloadEmscriptennet6Manifest70100Version> + <MicrosoftNETWorkloadEmscriptennet7Manifest70100Version>7.0.11</MicrosoftNETWorkloadEmscriptennet7Manifest70100Version> <EmscriptenWorkloadManifestVersion>$(MicrosoftNETWorkloadEmscriptennet7Manifest70100Version)</EmscriptenWorkloadManifestVersion> </PropertyGroup> <PropertyGroup> From cc1db914339b4012194a7de08ab967d094e6f19b Mon Sep 17 00:00:00 2001 From: Matt Thalman <Matt.Thalman@microsoft.com> Date: Thu, 17 Aug 2023 18:59:59 +0000 Subject: [PATCH 08/17] Merged PR 33235: Update 7.0 source-build SDK diff baseline --- .../assets/baselines/MsftToSbSdk.diff | 101 +----------------- 1 file changed, 5 insertions(+), 96 deletions(-) diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdk.diff b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdk.diff index 4d662a3c3..bd443698c 100644 --- a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdk.diff +++ b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdk.diff @@ -14,23 +14,7 @@ index ------------ ./packs/Microsoft.AspNetCore.App.Ref/ ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ @@ ------------ @@ - ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/Microsoft.JSInterop.xml - ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/Microsoft.Net.Http.Headers.dll - ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/Microsoft.Net.Http.Headers.xml -+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Diagnostics.DiagnosticSource.dll -+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Diagnostics.DiagnosticSource.xml - ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Diagnostics.EventLog.dll - ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Diagnostics.EventLog.xml -+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Formats.Asn1.dll -+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Formats.Asn1.xml - ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.IO.Pipelines.dll - ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.IO.Pipelines.xml - ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Security.Cryptography.Xml.dll ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Security.Cryptography.Xml.xml -+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Text.Encodings.Web.dll -+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Text.Encodings.Web.xml -+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Text.Json.dll -+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Text.Json.xml ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Threading.RateLimiting.dll ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Threading.RateLimiting.xml -./packs/Microsoft.NETCore.App.Host.portable-rid/ @@ -125,35 +109,6 @@ index ------------ ./sdk/x.y.z/DotnetTools/dotnet-format/tr/ ./sdk/x.y.z/DotnetTools/dotnet-format/tr/dotnet-format.resources.dll ./sdk/x.y.z/DotnetTools/dotnet-format/tr/Microsoft.CodeAnalysis.CSharp.Features.resources.dll -@@ ------------ @@ - ./sdk/x.y.z/DotnetTools/dotnet-user-jwts/x.y.z/tools/netx.y/any/Microsoft.IdentityModel.JsonWebTokens.dll - ./sdk/x.y.z/DotnetTools/dotnet-user-jwts/x.y.z/tools/netx.y/any/Microsoft.IdentityModel.Logging.dll - ./sdk/x.y.z/DotnetTools/dotnet-user-jwts/x.y.z/tools/netx.y/any/Microsoft.IdentityModel.Tokens.dll -+./sdk/x.y.z/DotnetTools/dotnet-user-jwts/x.y.z/tools/netx.y/any/runtimes/ -+./sdk/x.y.z/DotnetTools/dotnet-user-jwts/x.y.z/tools/netx.y/any/runtimes/browser/ -+./sdk/x.y.z/DotnetTools/dotnet-user-jwts/x.y.z/tools/netx.y/any/runtimes/browser/lib/ -+./sdk/x.y.z/DotnetTools/dotnet-user-jwts/x.y.z/tools/netx.y/any/runtimes/browser/lib/netx.y/ -+./sdk/x.y.z/DotnetTools/dotnet-user-jwts/x.y.z/tools/netx.y/any/runtimes/browser/lib/netx.y/System.Text.Encodings.Web.dll - ./sdk/x.y.z/DotnetTools/dotnet-user-jwts/x.y.z/tools/netx.y/any/System.IdentityModel.Tokens.Jwt.dll -+./sdk/x.y.z/DotnetTools/dotnet-user-jwts/x.y.z/tools/netx.y/any/System.Text.Encodings.Web.dll -+./sdk/x.y.z/DotnetTools/dotnet-user-jwts/x.y.z/tools/netx.y/any/System.Text.Json.dll - ./sdk/x.y.z/DotnetTools/dotnet-user-secrets/ - ./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/ - ./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/ -@@ ------------ @@ - ./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/Microsoft.Extensions.FileSystemGlobbing.dll - ./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/Microsoft.Extensions.Primitives.dll - ./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/Newtonsoft.Json.dll -+./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/runtimes/ -+./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/runtimes/browser/ -+./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/runtimes/browser/lib/ -+./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/runtimes/browser/lib/netx.y/ -+./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/runtimes/browser/lib/netx.y/System.Text.Encodings.Web.dll -+./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/System.Text.Encodings.Web.dll -+./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/System.Text.Json.dll - ./sdk/x.y.z/DotnetTools/dotnet-watch/ - ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/ - ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/ @@ ------------ @@ ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/Microsoft.CodeAnalysis.CSharp.Features.dll ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/Microsoft.CodeAnalysis.CSharp.Workspaces.dll @@ -169,26 +124,21 @@ index ------------ ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/middleware/Microsoft.AspNetCore.Watch.BrowserRefresh.dll ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/pl/ @@ ------------ @@ + ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/ru/Microsoft.CodeAnalysis.Workspaces.MSBuild.resources.dll ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/ru/Microsoft.CodeAnalysis.Workspaces.resources.dll ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/ru/System.CommandLine.resources.dll - ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/ +-./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/ -./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/unix/ -./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/unix/lib/ -./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/unix/lib/netx.y/ -./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/unix/lib/netx.y/System.Drawing.Common.dll -+./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/browser/ -+./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/browser/lib/ -+./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/browser/lib/netx.y/ -+./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/browser/lib/netx.y/System.Text.Encodings.Web.dll - ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/ - ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/lib/ - ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/lib/netx.y/ +-./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/ +-./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/lib/ +-./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/lib/netx.y/ -./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/lib/netx.y/Microsoft.Win32.SystemEvents.dll -./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/lib/netx.y/System.Drawing.Common.dll -./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/lib/netx.y/System.Security.Cryptography.ProtectedData.dll -./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/lib/netx.y/System.Windows.Extensions.dll -+./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/lib/netx.y/System.Text.Encoding.CodePages.dll -+./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Collections.Immutable.dll ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.CommandLine.dll ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Composition.AttributedModel.dll ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Composition.Convention.dll @@ -200,10 +150,6 @@ index ------------ -./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Security.Cryptography.ProtectedData.dll -./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Security.Permissions.dll -./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Windows.Extensions.dll -+./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Reflection.Metadata.dll -+./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Text.Encoding.CodePages.dll -+./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Text.Encodings.Web.dll -+./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Text.Json.dll ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/tr/ ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/tr/dotnet-watch.resources.dll ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/tr/Microsoft.CodeAnalysis.CSharp.Features.resources.dll @@ -259,21 +205,11 @@ index ------------ -./sdk/x.y.z/FSharp/runtimes/win/lib/netx.y/System.Security.Cryptography.ProtectedData.dll ./sdk/x.y.z/FSharp/runtimes/win/lib/netx.y/System.Windows.Extensions.dll ./sdk/x.y.z/FSharp/System.CodeDom.dll -+./sdk/x.y.z/FSharp/System.Collections.Immutable.dll ./sdk/x.y.z/FSharp/System.Configuration.ConfigurationManager.dll +./sdk/x.y.z/FSharp/System.Diagnostics.EventLog.dll ./sdk/x.y.z/FSharp/System.Drawing.Common.dll -+./sdk/x.y.z/FSharp/System.Formats.Asn1.dll -+./sdk/x.y.z/FSharp/System.Reflection.Metadata.dll ./sdk/x.y.z/FSharp/System.Resources.Extensions.dll ./sdk/x.y.z/FSharp/System.Security.Cryptography.Pkcs.dll - ./sdk/x.y.z/FSharp/System.Security.Cryptography.ProtectedData.dll - ./sdk/x.y.z/FSharp/System.Security.Cryptography.Xml.dll - ./sdk/x.y.z/FSharp/System.Security.Permissions.dll -+./sdk/x.y.z/FSharp/System.Threading.Tasks.Dataflow.dll - ./sdk/x.y.z/FSharp/System.Windows.Extensions.dll - ./sdk/x.y.z/FSharp/tr/ - ./sdk/x.y.z/FSharp/tr/FSharp.Build.resources.dll @@ ------------ @@ ./sdk/x.y.z/Microsoft.Build.NuGetSdkResolver.dll ./sdk/x.y.z/Microsoft.Build.Tasks.Core.dll @@ -329,13 +265,6 @@ index ------------ ./sdk/x.y.z/runtimes/win/lib/netx.y/Microsoft.Win32.SystemEvents.dll ./sdk/x.y.z/runtimes/win/lib/netx.y/System.Diagnostics.EventLog.dll ./sdk/x.y.z/runtimes/win/lib/netx.y/System.Diagnostics.EventLog.Messages.dll - ./sdk/x.y.z/runtimes/win/lib/netx.y/System.Drawing.Common.dll - ./sdk/x.y.z/runtimes/win/lib/netx.y/System.Security.Cryptography.Pkcs.dll - ./sdk/x.y.z/runtimes/win/lib/netx.y/System.ServiceProcess.ServiceController.dll -+./sdk/x.y.z/runtimes/win/lib/netx.y/System.Text.Encoding.CodePages.dll - ./sdk/x.y.z/runtimes/win/lib/netx.y/System.Windows.Extensions.dll - ./sdk/x.y.z/SDKPrecomputedAssemblyReferences.cache - ./sdk/x.y.z/SdkResolvers/ @@ ------------ @@ ./sdk/x.y.z/Sdks/Microsoft.NET.ILLink.Tasks/tools/net472/System.Buffers.dll ./sdk/x.y.z/Sdks/Microsoft.NET.ILLink.Tasks/tools/net472/System.Collections.Immutable.dll @@ -360,16 +289,6 @@ index ------------ ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Razor/tasks/net472/System.Reflection.Metadata.dll ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Razor/tasks/net472/System.Runtime.CompilerServices.Unsafe.dll ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Razor/tasks/net472/System.Text.Encodings.Web.dll -@@ ------------ @@ - ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Razor/tools/rzc.deps.json - ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Razor/tools/rzc.dll - ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Razor/tools/rzc.runtimeconfig.json -+./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Razor/tools/System.Collections.Immutable.dll -+./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Razor/tools/System.Reflection.Metadata.dll -+./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Razor/tools/System.Text.Encoding.CodePages.dll - ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Web.ProjectSystem/ - ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Web.ProjectSystem/Sdk/ - ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Web.ProjectSystem/Sdk/Sdk.props @@ ------------ @@ ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Web/tools/net472/Microsoft.NET.Sdk.Web.Tasks.dll ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Web/tools/netx.y/ @@ -387,28 +306,18 @@ index ------------ ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk/tools/net472/System.Runtime.CompilerServices.Unsafe.dll ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk/tools/net472/System.Text.Encodings.Web.dll @@ ------------ @@ - ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk/tools/netx.y/zh-Hant/Microsoft.NET.Build.Tasks.resources.dll ./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/ ./sdk/x.y.z/System.CodeDom.dll -+./sdk/x.y.z/System.Collections.Immutable.dll ./sdk/x.y.z/System.CommandLine.dll -./sdk/x.y.z/System.ComponentModel.Composition.dll ./sdk/x.y.z/System.Configuration.ConfigurationManager.dll ./sdk/x.y.z/System.Diagnostics.EventLog.dll ./sdk/x.y.z/System.Drawing.Common.dll -+./sdk/x.y.z/System.Formats.Asn1.dll -+./sdk/x.y.z/System.Reflection.Metadata.dll - ./sdk/x.y.z/System.Reflection.MetadataLoadContext.dll - ./sdk/x.y.z/System.Resources.Extensions.dll - ./sdk/x.y.z/System.Security.Cryptography.Pkcs.dll @@ ------------ @@ ./sdk/x.y.z/System.Security.Cryptography.Xml.dll ./sdk/x.y.z/System.Security.Permissions.dll ./sdk/x.y.z/System.ServiceProcess.ServiceController.dll -+./sdk/x.y.z/System.Text.Encoding.CodePages.dll +./sdk/x.y.z/System.Text.Encodings.Web.dll -+./sdk/x.y.z/System.Text.Json.dll -+./sdk/x.y.z/System.Threading.Tasks.Dataflow.dll ./sdk/x.y.z/System.Windows.Extensions.dll -./sdk/x.y.z/testhost-1.0.runtimeconfig.json -./sdk/x.y.z/testhost-1.1.runtimeconfig.json From 0bd4ef5d84ee2da1b57f8a70e58447db4de99029 Mon Sep 17 00:00:00 2001 From: DotNet-Bot <dn-bot@microsoft.com> Date: Tue, 22 Aug 2023 18:01:58 +0000 Subject: [PATCH 09/17] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230822.9 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.111 -> To Version 7.0.111 Dependency coherency updates Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,VS.Redist.Common.NetCore.SharedFramework.x64.7.0 From Version 7.0.11 -> To Version 7.0.11 (parent: Microsoft.NET.Sdk --- NuGet.config | 8 ++++---- eng/Version.Details.xml | 30 +++++++++++++++--------------- eng/Versions.props | 8 ++++---- 3 files changed, 23 insertions(+), 23 deletions(-) diff --git a/NuGet.config b/NuGet.config index feca935bf..a42e9c884 100644 --- a/NuGet.config +++ b/NuGet.config @@ -16,10 +16,10 @@ <add key="darc-pub-DotNet-msbuild-Trusted-6918b86" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-6918b863/nuget/v3/index.json" /> <!-- End: Package sources from DotNet-msbuild-Trusted --> <!-- Begin: Package sources from dotnet-runtime --> - <add key="darc-int-dotnet-runtime-de78412" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-de784122/nuget/v3/index.json" /> + <add key="darc-int-dotnet-runtime-41b7214" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-41b7214a/nuget/v3/index.json" /> <!-- End: Package sources from dotnet-runtime --> <!-- Begin: Package sources from dotnet-sdk --> - <add key="darc-int-dotnet-sdk-142937b" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-142937b3/nuget/v3/index.json" /> + <add key="darc-int-dotnet-sdk-2fad12d" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-2fad12db/nuget/v3/index.json" /> <!-- End: Package sources from dotnet-sdk --> <!-- Begin: Package sources from dotnet-windowsdesktop --> <add key="darc-int-dotnet-windowsdesktop-c9f28c6" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-c9f28c6a/nuget/v3/index.json" /> @@ -47,9 +47,9 @@ <add key="darc-int-dotnet-aspnetcore-29b2328" value="true" /> <!-- End: Package sources from dotnet-aspnetcore --> <!-- Begin: Package sources from dotnet-runtime --> - <add key="darc-int-dotnet-runtime-de78412" value="true" /> + <add key="darc-int-dotnet-runtime-41b7214" value="true" /> <!-- Begin: Package sources from dotnet-sdk --> - <add key="darc-int-dotnet-sdk-142937b" value="true" /> + <add key="darc-int-dotnet-sdk-2fad12d" value="true" /> <!-- End: Package sources from dotnet-sdk --> <!-- Begin: Package sources from dotnet-windowsdesktop --> <add key="darc-int-dotnet-windowsdesktop-c9f28c6" value="true" /> diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fd0c58a2e..881e10e99 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri> <Sha>c9f28c6a29182e54d1c292d1cff9778315cee51c</Sha> </Dependency> - <Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.7.0" Version="7.0.11-servicing.23415.17" CoherentParentDependency="Microsoft.NET.Sdk"> + <Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.7.0" Version="7.0.11-servicing.23418.12" CoherentParentDependency="Microsoft.NET.Sdk"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> - <Sha>de7841221e4ad56750e452db8ac4eab459b2ab23</Sha> + <Sha>41b7214ace077c230589720cf3460073d1bbd948</Sha> </Dependency> <Dependency Name="Microsoft.NETCore.App.Ref" Version="7.0.11" CoherentParentDependency="Microsoft.NET.Sdk"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> - <Sha>de7841221e4ad56750e452db8ac4eab459b2ab23</Sha> + <Sha>41b7214ace077c230589720cf3460073d1bbd948</Sha> </Dependency> - <Dependency Name="VS.Redist.Common.NetCore.TargetingPack.x64.7.0" Version="7.0.11-servicing.23415.17" CoherentParentDependency="Microsoft.NET.Sdk"> + <Dependency Name="VS.Redist.Common.NetCore.TargetingPack.x64.7.0" Version="7.0.11-servicing.23418.12" CoherentParentDependency="Microsoft.NET.Sdk"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> - <Sha>de7841221e4ad56750e452db8ac4eab459b2ab23</Sha> + <Sha>41b7214ace077c230589720cf3460073d1bbd948</Sha> </Dependency> <Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="7.0.11" CoherentParentDependency="Microsoft.NET.Sdk"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> - <Sha>de7841221e4ad56750e452db8ac4eab459b2ab23</Sha> + <Sha>41b7214ace077c230589720cf3460073d1bbd948</Sha> <SourceBuildTarball RepoName="runtime" ManagedOnly="true" /> </Dependency> <Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="7.0.11" CoherentParentDependency="Microsoft.NET.Sdk"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> - <Sha>de7841221e4ad56750e452db8ac4eab459b2ab23</Sha> + <Sha>41b7214ace077c230589720cf3460073d1bbd948</Sha> </Dependency> <Dependency Name="Microsoft.NETCore.DotNetHostResolver" Version="7.0.11" CoherentParentDependency="Microsoft.NET.Sdk"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> - <Sha>de7841221e4ad56750e452db8ac4eab459b2ab23</Sha> + <Sha>41b7214ace077c230589720cf3460073d1bbd948</Sha> </Dependency> <!-- Change blob version in GenerateLayout.targets if this is unpinned to service targeting pack --> <!-- No new netstandard.library planned for 3.1 timeframe at this time. --> @@ -100,20 +100,20 @@ </Dependency> <Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="7.0.111"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri> - <Sha>142937b396f99e3331d8b9fa3c529e6169a7405f</Sha> + <Sha>2fad12db2d9c657ef65e907a86bd5238abb95c56</Sha> </Dependency> - <Dependency Name="Microsoft.TemplateEngine.Cli" Version="7.0.111-servicing.23416.54"> + <Dependency Name="Microsoft.TemplateEngine.Cli" Version="7.0.111-servicing.23422.9"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri> - <Sha>142937b396f99e3331d8b9fa3c529e6169a7405f</Sha> + <Sha>2fad12db2d9c657ef65e907a86bd5238abb95c56</Sha> </Dependency> - <Dependency Name="Microsoft.NET.Sdk" Version="7.0.111-servicing.23416.54"> + <Dependency Name="Microsoft.NET.Sdk" Version="7.0.111-servicing.23422.9"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri> - <Sha>142937b396f99e3331d8b9fa3c529e6169a7405f</Sha> + <Sha>2fad12db2d9c657ef65e907a86bd5238abb95c56</Sha> <SourceBuild RepoName="sdk" ManagedOnly="true" /> </Dependency> - <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="7.0.111-servicing.23416.54"> + <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="7.0.111-servicing.23422.9"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri> - <Sha>142937b396f99e3331d8b9fa3c529e6169a7405f</Sha> + <Sha>2fad12db2d9c657ef65e907a86bd5238abb95c56</Sha> </Dependency> <!-- For coherency purposes, these versions should be gated by the versions of winforms and wpf routed via windowsdesktop --> <Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="7.0.11-servicing.23416.5" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64"> diff --git a/eng/Versions.props b/eng/Versions.props index cc9d7ddb2..cd708b8c1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -70,8 +70,8 @@ <PropertyGroup> <!-- Dependencies from https://github.com/dotnet/sdk --> <MicrosoftDotNetCommonItemTemplatesPackageVersion>7.0.111</MicrosoftDotNetCommonItemTemplatesPackageVersion> - <MicrosoftNETSdkPackageVersion>7.0.111-servicing.23416.54</MicrosoftNETSdkPackageVersion> - <MicrosoftDotNetMSBuildSdkResolverPackageVersion>7.0.111-servicing.23416.54</MicrosoftDotNetMSBuildSdkResolverPackageVersion> + <MicrosoftNETSdkPackageVersion>7.0.111-servicing.23422.9</MicrosoftNETSdkPackageVersion> + <MicrosoftDotNetMSBuildSdkResolverPackageVersion>7.0.111-servicing.23422.9</MicrosoftDotNetMSBuildSdkResolverPackageVersion> <MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion> <MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion> <MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion> @@ -82,8 +82,8 @@ </PropertyGroup> <PropertyGroup> <!-- Dependencies from https://github.com/dotnet/core-setup --> - <VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion>7.0.11-servicing.23415.17</VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion> - <VSRedistCommonNetCoreTargetingPackx6470PackageVersion>7.0.11-servicing.23415.17</VSRedistCommonNetCoreTargetingPackx6470PackageVersion> + <VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion>7.0.11-servicing.23418.12</VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion> + <VSRedistCommonNetCoreTargetingPackx6470PackageVersion>7.0.11-servicing.23418.12</VSRedistCommonNetCoreTargetingPackx6470PackageVersion> <MicrosoftNETCoreAppRuntimewinx64PackageVersion>7.0.11</MicrosoftNETCoreAppRuntimewinx64PackageVersion> <MicrosoftNETCoreAppHostwinx64PackageVersion>7.0.11</MicrosoftNETCoreAppHostwinx64PackageVersion> <MicrosoftNETCoreAppRefPackageVersion>7.0.11</MicrosoftNETCoreAppRefPackageVersion> From da8de81b20802be3fd79d6db6acc08fa0d0a240c Mon Sep 17 00:00:00 2001 From: DotNet-Bot <dn-bot@microsoft.com> Date: Tue, 22 Aug 2023 19:04:45 +0000 Subject: [PATCH 10/17] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230822.12 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.111 -> To Version 7.0.111 --- NuGet.config | 4 ++-- eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 4 ++-- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/NuGet.config b/NuGet.config index a42e9c884..9fcf793ad 100644 --- a/NuGet.config +++ b/NuGet.config @@ -19,7 +19,7 @@ <add key="darc-int-dotnet-runtime-41b7214" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-41b7214a/nuget/v3/index.json" /> <!-- End: Package sources from dotnet-runtime --> <!-- Begin: Package sources from dotnet-sdk --> - <add key="darc-int-dotnet-sdk-2fad12d" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-2fad12db/nuget/v3/index.json" /> + <add key="darc-int-dotnet-sdk-1aede6f" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-1aede6f6/nuget/v3/index.json" /> <!-- End: Package sources from dotnet-sdk --> <!-- Begin: Package sources from dotnet-windowsdesktop --> <add key="darc-int-dotnet-windowsdesktop-c9f28c6" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-c9f28c6a/nuget/v3/index.json" /> @@ -49,7 +49,7 @@ <!-- Begin: Package sources from dotnet-runtime --> <add key="darc-int-dotnet-runtime-41b7214" value="true" /> <!-- Begin: Package sources from dotnet-sdk --> - <add key="darc-int-dotnet-sdk-2fad12d" value="true" /> + <add key="darc-int-dotnet-sdk-1aede6f" value="true" /> <!-- End: Package sources from dotnet-sdk --> <!-- Begin: Package sources from dotnet-windowsdesktop --> <add key="darc-int-dotnet-windowsdesktop-c9f28c6" value="true" /> diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 881e10e99..3482698e4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,20 +100,20 @@ </Dependency> <Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="7.0.111"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri> - <Sha>2fad12db2d9c657ef65e907a86bd5238abb95c56</Sha> + <Sha>1aede6f6299c7d77853a33e4e317b96bbd1fca81</Sha> </Dependency> - <Dependency Name="Microsoft.TemplateEngine.Cli" Version="7.0.111-servicing.23422.9"> + <Dependency Name="Microsoft.TemplateEngine.Cli" Version="7.0.111-servicing.23422.12"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri> - <Sha>2fad12db2d9c657ef65e907a86bd5238abb95c56</Sha> + <Sha>1aede6f6299c7d77853a33e4e317b96bbd1fca81</Sha> </Dependency> - <Dependency Name="Microsoft.NET.Sdk" Version="7.0.111-servicing.23422.9"> + <Dependency Name="Microsoft.NET.Sdk" Version="7.0.111-servicing.23422.12"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri> - <Sha>2fad12db2d9c657ef65e907a86bd5238abb95c56</Sha> + <Sha>1aede6f6299c7d77853a33e4e317b96bbd1fca81</Sha> <SourceBuild RepoName="sdk" ManagedOnly="true" /> </Dependency> - <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="7.0.111-servicing.23422.9"> + <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="7.0.111-servicing.23422.12"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri> - <Sha>2fad12db2d9c657ef65e907a86bd5238abb95c56</Sha> + <Sha>1aede6f6299c7d77853a33e4e317b96bbd1fca81</Sha> </Dependency> <!-- For coherency purposes, these versions should be gated by the versions of winforms and wpf routed via windowsdesktop --> <Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="7.0.11-servicing.23416.5" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64"> diff --git a/eng/Versions.props b/eng/Versions.props index cd708b8c1..597efa244 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -70,8 +70,8 @@ <PropertyGroup> <!-- Dependencies from https://github.com/dotnet/sdk --> <MicrosoftDotNetCommonItemTemplatesPackageVersion>7.0.111</MicrosoftDotNetCommonItemTemplatesPackageVersion> - <MicrosoftNETSdkPackageVersion>7.0.111-servicing.23422.9</MicrosoftNETSdkPackageVersion> - <MicrosoftDotNetMSBuildSdkResolverPackageVersion>7.0.111-servicing.23422.9</MicrosoftDotNetMSBuildSdkResolverPackageVersion> + <MicrosoftNETSdkPackageVersion>7.0.111-servicing.23422.12</MicrosoftNETSdkPackageVersion> + <MicrosoftDotNetMSBuildSdkResolverPackageVersion>7.0.111-servicing.23422.12</MicrosoftDotNetMSBuildSdkResolverPackageVersion> <MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion> <MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion> <MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion> From 9b21f27366b6e40d953d1b8d9a3a6fa18513e371 Mon Sep 17 00:00:00 2001 From: DotNet-Bot <dn-bot@microsoft.com> Date: Tue, 22 Aug 2023 22:21:17 +0000 Subject: [PATCH 11/17] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230822.24 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.111 -> To Version 7.0.111 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.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 From Version 7.0.11 -> To Version 7.0.11 (parent: Microsoft.NET.Sdk --- NuGet.config | 12 ++++----- eng/Version.Details.xml | 58 ++++++++++++++++++++--------------------- eng/Versions.props | 22 ++++++++-------- 3 files changed, 46 insertions(+), 46 deletions(-) diff --git a/NuGet.config b/NuGet.config index 9fcf793ad..65273e3fc 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ <clear /> <!--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-29b2328" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-29b23288/nuget/v3/index.json" /> + <add key="darc-int-dotnet-aspnetcore-cf068f2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-cf068f24/nuget/v3/index.json" /> <!-- End: Package sources from dotnet-aspnetcore --> <!-- Begin: Package sources from dotnet-emsdk --> <add key="darc-pub-dotnet-emsdk-fcd8602" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-fcd86021/nuget/v3/index.json" /> @@ -19,10 +19,10 @@ <add key="darc-int-dotnet-runtime-41b7214" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-41b7214a/nuget/v3/index.json" /> <!-- End: Package sources from dotnet-runtime --> <!-- Begin: Package sources from dotnet-sdk --> - <add key="darc-int-dotnet-sdk-1aede6f" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-1aede6f6/nuget/v3/index.json" /> + <add key="darc-int-dotnet-sdk-587a472" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-587a4726/nuget/v3/index.json" /> <!-- End: Package sources from dotnet-sdk --> <!-- Begin: Package sources from dotnet-windowsdesktop --> - <add key="darc-int-dotnet-windowsdesktop-c9f28c6" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-c9f28c6a/nuget/v3/index.json" /> + <add key="darc-int-dotnet-windowsdesktop-721967a" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-721967ad/nuget/v3/index.json" /> <!-- End: Package sources from dotnet-windowsdesktop --> <!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.--> <add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" /> @@ -44,15 +44,15 @@ <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-29b2328" value="true" /> + <add key="darc-int-dotnet-aspnetcore-cf068f2" value="true" /> <!-- End: Package sources from dotnet-aspnetcore --> <!-- Begin: Package sources from dotnet-runtime --> <add key="darc-int-dotnet-runtime-41b7214" value="true" /> <!-- Begin: Package sources from dotnet-sdk --> - <add key="darc-int-dotnet-sdk-1aede6f" value="true" /> + <add key="darc-int-dotnet-sdk-587a472" value="true" /> <!-- End: Package sources from dotnet-sdk --> <!-- Begin: Package sources from dotnet-windowsdesktop --> - <add key="darc-int-dotnet-windowsdesktop-c9f28c6" value="true" /> + <add key="darc-int-dotnet-windowsdesktop-721967a" value="true" /> <!-- End: Package sources from dotnet-windowsdesktop --> <!-- End: Package sources from dotnet-runtime --> <!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.--> diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3482698e4..fdfcfcb33 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ <ProductDependencies> <Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="7.0.11" CoherentParentDependency="Microsoft.NET.Sdk"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri> - <Sha>c9f28c6a29182e54d1c292d1cff9778315cee51c</Sha> + <Sha>721967ad57b950287505e20f9953ff14b9a10485</Sha> </Dependency> - <Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0" Version="7.0.11-servicing.23416.8" CoherentParentDependency="Microsoft.NET.Sdk"> + <Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0" Version="7.0.11-servicing.23422.3" CoherentParentDependency="Microsoft.NET.Sdk"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri> - <Sha>c9f28c6a29182e54d1c292d1cff9778315cee51c</Sha> + <Sha>721967ad57b950287505e20f9953ff14b9a10485</Sha> </Dependency> - <Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0" Version="7.0.11-servicing.23416.8" CoherentParentDependency="Microsoft.NET.Sdk"> + <Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0" Version="7.0.11-servicing.23422.3" CoherentParentDependency="Microsoft.NET.Sdk"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri> - <Sha>c9f28c6a29182e54d1c292d1cff9778315cee51c</Sha> + <Sha>721967ad57b950287505e20f9953ff14b9a10485</Sha> </Dependency> <Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="7.0.11" CoherentParentDependency="Microsoft.NET.Sdk"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri> - <Sha>c9f28c6a29182e54d1c292d1cff9778315cee51c</Sha> + <Sha>721967ad57b950287505e20f9953ff14b9a10485</Sha> </Dependency> <Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.7.0" Version="7.0.11-servicing.23418.12" CoherentParentDependency="Microsoft.NET.Sdk"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> @@ -54,32 +54,32 @@ </Dependency> <Dependency Name="Microsoft.AspNetCore.App.Ref" Version="7.0.11" CoherentParentDependency="Microsoft.NET.Sdk"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri> - <Sha>29b232880d00408f61601fd63a87d54784dde835</Sha> + <Sha>cf068f24c37b6166910886b26bde7bd32bf71259</Sha> </Dependency> - <Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="7.0.11-servicing.23416.1" CoherentParentDependency="Microsoft.NET.Sdk"> + <Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="7.0.11-servicing.23422.8" CoherentParentDependency="Microsoft.NET.Sdk"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri> - <Sha>29b232880d00408f61601fd63a87d54784dde835</Sha> + <Sha>cf068f24c37b6166910886b26bde7bd32bf71259</Sha> <SourceBuild RepoName="aspnetcore" ManagedOnly="true" /> </Dependency> <Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="7.0.11" CoherentParentDependency="Microsoft.NET.Sdk"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri> - <Sha>29b232880d00408f61601fd63a87d54784dde835</Sha> + <Sha>cf068f24c37b6166910886b26bde7bd32bf71259</Sha> </Dependency> - <Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0" Version="7.0.11-servicing.23416.1" CoherentParentDependency="Microsoft.NET.Sdk"> + <Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0" Version="7.0.11-servicing.23422.8" CoherentParentDependency="Microsoft.NET.Sdk"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri> - <Sha>29b232880d00408f61601fd63a87d54784dde835</Sha> + <Sha>cf068f24c37b6166910886b26bde7bd32bf71259</Sha> </Dependency> - <Dependency Name="dotnet-dev-certs" Version="7.0.11-servicing.23416.1" CoherentParentDependency="Microsoft.NET.Sdk"> + <Dependency Name="dotnet-dev-certs" Version="7.0.11-servicing.23422.8" CoherentParentDependency="Microsoft.NET.Sdk"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri> - <Sha>29b232880d00408f61601fd63a87d54784dde835</Sha> + <Sha>cf068f24c37b6166910886b26bde7bd32bf71259</Sha> </Dependency> - <Dependency Name="dotnet-user-jwts" Version="7.0.11-servicing.23416.1" CoherentParentDependency="Microsoft.NET.Sdk"> + <Dependency Name="dotnet-user-jwts" Version="7.0.11-servicing.23422.8" CoherentParentDependency="Microsoft.NET.Sdk"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri> - <Sha>29b232880d00408f61601fd63a87d54784dde835</Sha> + <Sha>cf068f24c37b6166910886b26bde7bd32bf71259</Sha> </Dependency> - <Dependency Name="dotnet-user-secrets" Version="7.0.11-servicing.23416.1" CoherentParentDependency="Microsoft.NET.Sdk"> + <Dependency Name="dotnet-user-secrets" Version="7.0.11-servicing.23422.8" CoherentParentDependency="Microsoft.NET.Sdk"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri> - <Sha>29b232880d00408f61601fd63a87d54784dde835</Sha> + <Sha>cf068f24c37b6166910886b26bde7bd32bf71259</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> @@ -100,29 +100,29 @@ </Dependency> <Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="7.0.111"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri> - <Sha>1aede6f6299c7d77853a33e4e317b96bbd1fca81</Sha> + <Sha>587a47261def4391c5fded60fd79ea3414c4a9af</Sha> </Dependency> - <Dependency Name="Microsoft.TemplateEngine.Cli" Version="7.0.111-servicing.23422.12"> + <Dependency Name="Microsoft.TemplateEngine.Cli" Version="7.0.111-servicing.23422.24"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri> - <Sha>1aede6f6299c7d77853a33e4e317b96bbd1fca81</Sha> + <Sha>587a47261def4391c5fded60fd79ea3414c4a9af</Sha> </Dependency> - <Dependency Name="Microsoft.NET.Sdk" Version="7.0.111-servicing.23422.12"> + <Dependency Name="Microsoft.NET.Sdk" Version="7.0.111-servicing.23422.24"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri> - <Sha>1aede6f6299c7d77853a33e4e317b96bbd1fca81</Sha> + <Sha>587a47261def4391c5fded60fd79ea3414c4a9af</Sha> <SourceBuild RepoName="sdk" ManagedOnly="true" /> </Dependency> - <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="7.0.111-servicing.23422.12"> + <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="7.0.111-servicing.23422.24"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri> - <Sha>1aede6f6299c7d77853a33e4e317b96bbd1fca81</Sha> + <Sha>587a47261def4391c5fded60fd79ea3414c4a9af</Sha> </Dependency> <!-- For coherency purposes, these versions should be gated by the versions of winforms and wpf routed via windowsdesktop --> - <Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="7.0.11-servicing.23416.5" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64"> + <Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="7.0.11-servicing.23422.3" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-winforms</Uri> - <Sha>639189647d647da4008fa57fd63b1d415c84b487</Sha> + <Sha>81760b1e789d848e1c44733615cf2939159603a3</Sha> </Dependency> - <Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="7.0.11-servicing.23416.7" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64"> + <Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="7.0.11-servicing.23422.2" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri> - <Sha>8037dc673134da614f02f4b84f6a9a61e047ae60</Sha> + <Sha>aea83fde388f1f90c7068116c2653b12e31bac40</Sha> </Dependency> <Dependency Name="Microsoft.FSharp.Compiler" Version="12.4.0-beta.22571.5" CoherentParentDependency="Microsoft.NET.Sdk"> <Uri>https://github.com/dotnet/fsharp</Uri> diff --git a/eng/Versions.props b/eng/Versions.props index 597efa244..f80c644bb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,11 +37,11 @@ </PropertyGroup> <PropertyGroup> <!-- Dependency from https://github.com/dotnet/winforms --> - <MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>7.0.11-servicing.23416.5</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion> + <MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>7.0.11-servicing.23422.3</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion> </PropertyGroup> <PropertyGroup> <!-- Dependency from https://github.com/dotnet/wpf --> - <MicrosoftDotNetWpfProjectTemplatesPackageVersion>7.0.11-servicing.23416.7</MicrosoftDotNetWpfProjectTemplatesPackageVersion> + <MicrosoftDotNetWpfProjectTemplatesPackageVersion>7.0.11-servicing.23422.2</MicrosoftDotNetWpfProjectTemplatesPackageVersion> </PropertyGroup> <PropertyGroup> <!-- Dependency from https://github.com/dotnet/test-templates --> @@ -58,11 +58,11 @@ <!-- Dependencies from https://github.com/aspnet/AspNetCore --> <MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>7.0.11</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion> <MicrosoftAspNetCoreAppRefPackageVersion>7.0.11</MicrosoftAspNetCoreAppRefPackageVersion> - <MicrosoftAspNetCoreAppRefInternalPackageVersion>7.0.11-servicing.23416.1</MicrosoftAspNetCoreAppRefInternalPackageVersion> - <VSRedistCommonAspNetCoreSharedFrameworkx6470PackageVersion>7.0.11-servicing.23416.1</VSRedistCommonAspNetCoreSharedFrameworkx6470PackageVersion> - <dotnetdevcertsPackageVersion>7.0.11-servicing.23416.1</dotnetdevcertsPackageVersion> - <dotnetuserjwtsPackageVersion>7.0.11-servicing.23416.1</dotnetuserjwtsPackageVersion> - <dotnetusersecretsPackageVersion>7.0.11-servicing.23416.1</dotnetusersecretsPackageVersion> + <MicrosoftAspNetCoreAppRefInternalPackageVersion>7.0.11-servicing.23422.8</MicrosoftAspNetCoreAppRefInternalPackageVersion> + <VSRedistCommonAspNetCoreSharedFrameworkx6470PackageVersion>7.0.11-servicing.23422.8</VSRedistCommonAspNetCoreSharedFrameworkx6470PackageVersion> + <dotnetdevcertsPackageVersion>7.0.11-servicing.23422.8</dotnetdevcertsPackageVersion> + <dotnetuserjwtsPackageVersion>7.0.11-servicing.23422.8</dotnetuserjwtsPackageVersion> + <dotnetusersecretsPackageVersion>7.0.11-servicing.23422.8</dotnetusersecretsPackageVersion> </PropertyGroup> <PropertyGroup> <MicroBuildCorePackageVersion>0.2.0</MicroBuildCorePackageVersion> @@ -70,8 +70,8 @@ <PropertyGroup> <!-- Dependencies from https://github.com/dotnet/sdk --> <MicrosoftDotNetCommonItemTemplatesPackageVersion>7.0.111</MicrosoftDotNetCommonItemTemplatesPackageVersion> - <MicrosoftNETSdkPackageVersion>7.0.111-servicing.23422.12</MicrosoftNETSdkPackageVersion> - <MicrosoftDotNetMSBuildSdkResolverPackageVersion>7.0.111-servicing.23422.12</MicrosoftDotNetMSBuildSdkResolverPackageVersion> + <MicrosoftNETSdkPackageVersion>7.0.111-servicing.23422.24</MicrosoftNETSdkPackageVersion> + <MicrosoftDotNetMSBuildSdkResolverPackageVersion>7.0.111-servicing.23422.24</MicrosoftDotNetMSBuildSdkResolverPackageVersion> <MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion> <MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion> <MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion> @@ -92,8 +92,8 @@ </PropertyGroup> <PropertyGroup> <!-- Dependencies from https://github.com/dotnet/windowsdesktop --> - <VSRedistCommonWindowsDesktopSharedFrameworkx6470PackageVersion>7.0.11-servicing.23416.8</VSRedistCommonWindowsDesktopSharedFrameworkx6470PackageVersion> - <VSRedistCommonWindowsDesktopTargetingPackx6470PackageVersion>7.0.11-servicing.23416.8</VSRedistCommonWindowsDesktopTargetingPackx6470PackageVersion> + <VSRedistCommonWindowsDesktopSharedFrameworkx6470PackageVersion>7.0.11-servicing.23422.3</VSRedistCommonWindowsDesktopSharedFrameworkx6470PackageVersion> + <VSRedistCommonWindowsDesktopTargetingPackx6470PackageVersion>7.0.11-servicing.23422.3</VSRedistCommonWindowsDesktopTargetingPackx6470PackageVersion> <MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>7.0.11</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion> <MicrosoftWindowsDesktopAppRefPackageVersion>7.0.11</MicrosoftWindowsDesktopAppRefPackageVersion> </PropertyGroup> From b0295ea498bd466d61c73edd04cf0ef378edcc6c Mon Sep 17 00:00:00 2001 From: DotNet-Bot <dn-bot@microsoft.com> Date: Fri, 25 Aug 2023 16:05:35 +0000 Subject: [PATCH 12/17] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230825.22 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.111 -> To Version 7.0.111 Dependency coherency updates Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100 From Version 7.0.11 -> To Version 7.0.11 (parent: Microsoft.NET.Sdk --- NuGet.config | 10 +++++----- eng/Version.Details.xml | 34 +++++++++++++++++----------------- eng/Versions.props | 8 ++++---- 3 files changed, 26 insertions(+), 26 deletions(-) diff --git a/NuGet.config b/NuGet.config index 65273e3fc..2b6b9e39f 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,16 +10,16 @@ <add key="darc-int-dotnet-aspnetcore-cf068f2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-cf068f24/nuget/v3/index.json" /> <!-- End: Package sources from dotnet-aspnetcore --> <!-- Begin: Package sources from dotnet-emsdk --> - <add key="darc-pub-dotnet-emsdk-fcd8602" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-fcd86021/nuget/v3/index.json" /> + <add key="darc-pub-dotnet-emsdk-79b01e4" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-79b01e47/nuget/v3/index.json" /> <!-- End: Package sources from dotnet-emsdk --> <!-- Begin: Package sources from DotNet-msbuild-Trusted --> <add key="darc-pub-DotNet-msbuild-Trusted-6918b86" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-6918b863/nuget/v3/index.json" /> <!-- End: Package sources from DotNet-msbuild-Trusted --> <!-- Begin: Package sources from dotnet-runtime --> - <add key="darc-int-dotnet-runtime-41b7214" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-41b7214a/nuget/v3/index.json" /> + <add key="darc-int-dotnet-runtime-ecb34f8" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-ecb34f85/nuget/v3/index.json" /> <!-- End: Package sources from dotnet-runtime --> <!-- Begin: Package sources from dotnet-sdk --> - <add key="darc-int-dotnet-sdk-587a472" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-587a4726/nuget/v3/index.json" /> + <add key="darc-int-dotnet-sdk-b257a52" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-b257a52f/nuget/v3/index.json" /> <!-- End: Package sources from dotnet-sdk --> <!-- Begin: Package sources from dotnet-windowsdesktop --> <add key="darc-int-dotnet-windowsdesktop-721967a" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-721967ad/nuget/v3/index.json" /> @@ -47,9 +47,9 @@ <add key="darc-int-dotnet-aspnetcore-cf068f2" value="true" /> <!-- End: Package sources from dotnet-aspnetcore --> <!-- Begin: Package sources from dotnet-runtime --> - <add key="darc-int-dotnet-runtime-41b7214" value="true" /> + <add key="darc-int-dotnet-runtime-ecb34f8" value="true" /> <!-- Begin: Package sources from dotnet-sdk --> - <add key="darc-int-dotnet-sdk-587a472" value="true" /> + <add key="darc-int-dotnet-sdk-b257a52" value="true" /> <!-- End: Package sources from dotnet-sdk --> <!-- Begin: Package sources from dotnet-windowsdesktop --> <add key="darc-int-dotnet-windowsdesktop-721967a" value="true" /> diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fdfcfcb33..17b26bbe8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri> <Sha>721967ad57b950287505e20f9953ff14b9a10485</Sha> </Dependency> - <Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.7.0" Version="7.0.11-servicing.23418.12" CoherentParentDependency="Microsoft.NET.Sdk"> + <Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.7.0" Version="7.0.11-servicing.23424.27" CoherentParentDependency="Microsoft.NET.Sdk"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> - <Sha>41b7214ace077c230589720cf3460073d1bbd948</Sha> + <Sha>ecb34f85ec92e1b3c814edf7da83337e199e7f66</Sha> </Dependency> <Dependency Name="Microsoft.NETCore.App.Ref" Version="7.0.11" CoherentParentDependency="Microsoft.NET.Sdk"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> - <Sha>41b7214ace077c230589720cf3460073d1bbd948</Sha> + <Sha>ecb34f85ec92e1b3c814edf7da83337e199e7f66</Sha> </Dependency> - <Dependency Name="VS.Redist.Common.NetCore.TargetingPack.x64.7.0" Version="7.0.11-servicing.23418.12" CoherentParentDependency="Microsoft.NET.Sdk"> + <Dependency Name="VS.Redist.Common.NetCore.TargetingPack.x64.7.0" Version="7.0.11-servicing.23424.27" CoherentParentDependency="Microsoft.NET.Sdk"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> - <Sha>41b7214ace077c230589720cf3460073d1bbd948</Sha> + <Sha>ecb34f85ec92e1b3c814edf7da83337e199e7f66</Sha> </Dependency> <Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="7.0.11" CoherentParentDependency="Microsoft.NET.Sdk"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> - <Sha>41b7214ace077c230589720cf3460073d1bbd948</Sha> + <Sha>ecb34f85ec92e1b3c814edf7da83337e199e7f66</Sha> <SourceBuildTarball RepoName="runtime" ManagedOnly="true" /> </Dependency> <Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="7.0.11" CoherentParentDependency="Microsoft.NET.Sdk"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> - <Sha>41b7214ace077c230589720cf3460073d1bbd948</Sha> + <Sha>ecb34f85ec92e1b3c814edf7da83337e199e7f66</Sha> </Dependency> <Dependency Name="Microsoft.NETCore.DotNetHostResolver" Version="7.0.11" CoherentParentDependency="Microsoft.NET.Sdk"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> - <Sha>41b7214ace077c230589720cf3460073d1bbd948</Sha> + <Sha>ecb34f85ec92e1b3c814edf7da83337e199e7f66</Sha> </Dependency> <!-- Change blob version in GenerateLayout.targets if this is unpinned to service targeting pack --> <!-- No new netstandard.library planned for 3.1 timeframe at this time. --> @@ -100,20 +100,20 @@ </Dependency> <Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="7.0.111"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri> - <Sha>587a47261def4391c5fded60fd79ea3414c4a9af</Sha> + <Sha>b257a52f3e0245203a2888dcbdd46c99be86bf56</Sha> </Dependency> - <Dependency Name="Microsoft.TemplateEngine.Cli" Version="7.0.111-servicing.23422.24"> + <Dependency Name="Microsoft.TemplateEngine.Cli" Version="7.0.111-servicing.23425.22"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri> - <Sha>587a47261def4391c5fded60fd79ea3414c4a9af</Sha> + <Sha>b257a52f3e0245203a2888dcbdd46c99be86bf56</Sha> </Dependency> - <Dependency Name="Microsoft.NET.Sdk" Version="7.0.111-servicing.23422.24"> + <Dependency Name="Microsoft.NET.Sdk" Version="7.0.111-servicing.23425.22"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri> - <Sha>587a47261def4391c5fded60fd79ea3414c4a9af</Sha> + <Sha>b257a52f3e0245203a2888dcbdd46c99be86bf56</Sha> <SourceBuild RepoName="sdk" ManagedOnly="true" /> </Dependency> - <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="7.0.111-servicing.23422.24"> + <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="7.0.111-servicing.23425.22"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri> - <Sha>587a47261def4391c5fded60fd79ea3414c4a9af</Sha> + <Sha>b257a52f3e0245203a2888dcbdd46c99be86bf56</Sha> </Dependency> <!-- For coherency purposes, these versions should be gated by the versions of winforms and wpf routed via windowsdesktop --> <Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="7.0.11-servicing.23422.3" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64"> @@ -165,11 +165,11 @@ </Dependency> <Dependency Name="Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100" Version="7.0.11" CoherentParentDependency="VS.Redist.Common.NetCore.SharedFramework.x64.7.0"> <Uri>https://github.com/dotnet/emsdk</Uri> - <Sha>fcd8602188cfe2f73c73f5ae57e33c0654ce9858</Sha> + <Sha>79b01e47d43eeba5442af569770480696102972f</Sha> </Dependency> <Dependency Name="Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100" Version="7.0.11" CoherentParentDependency="VS.Redist.Common.NetCore.SharedFramework.x64.7.0"> <Uri>https://github.com/dotnet/emsdk</Uri> - <Sha>fcd8602188cfe2f73c73f5ae57e33c0654ce9858</Sha> + <Sha>79b01e47d43eeba5442af569770480696102972f</Sha> </Dependency> <Dependency Name="Microsoft.Deployment.DotNet.Releases" Version="1.0.0-preview5.1.22263.1"> <Uri>https://github.com/dotnet/deployment-tools</Uri> diff --git a/eng/Versions.props b/eng/Versions.props index f80c644bb..21b3651b2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -70,8 +70,8 @@ <PropertyGroup> <!-- Dependencies from https://github.com/dotnet/sdk --> <MicrosoftDotNetCommonItemTemplatesPackageVersion>7.0.111</MicrosoftDotNetCommonItemTemplatesPackageVersion> - <MicrosoftNETSdkPackageVersion>7.0.111-servicing.23422.24</MicrosoftNETSdkPackageVersion> - <MicrosoftDotNetMSBuildSdkResolverPackageVersion>7.0.111-servicing.23422.24</MicrosoftDotNetMSBuildSdkResolverPackageVersion> + <MicrosoftNETSdkPackageVersion>7.0.111-servicing.23425.22</MicrosoftNETSdkPackageVersion> + <MicrosoftDotNetMSBuildSdkResolverPackageVersion>7.0.111-servicing.23425.22</MicrosoftDotNetMSBuildSdkResolverPackageVersion> <MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion> <MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion> <MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion> @@ -82,8 +82,8 @@ </PropertyGroup> <PropertyGroup> <!-- Dependencies from https://github.com/dotnet/core-setup --> - <VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion>7.0.11-servicing.23418.12</VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion> - <VSRedistCommonNetCoreTargetingPackx6470PackageVersion>7.0.11-servicing.23418.12</VSRedistCommonNetCoreTargetingPackx6470PackageVersion> + <VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion>7.0.11-servicing.23424.27</VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion> + <VSRedistCommonNetCoreTargetingPackx6470PackageVersion>7.0.11-servicing.23424.27</VSRedistCommonNetCoreTargetingPackx6470PackageVersion> <MicrosoftNETCoreAppRuntimewinx64PackageVersion>7.0.11</MicrosoftNETCoreAppRuntimewinx64PackageVersion> <MicrosoftNETCoreAppHostwinx64PackageVersion>7.0.11</MicrosoftNETCoreAppHostwinx64PackageVersion> <MicrosoftNETCoreAppRefPackageVersion>7.0.11</MicrosoftNETCoreAppRefPackageVersion> From 39579bbae4a397a8beca6a4305c764062d42e47e Mon Sep 17 00:00:00 2001 From: DotNet-Bot <dn-bot@microsoft.com> Date: Fri, 25 Aug 2023 17:54:59 +0000 Subject: [PATCH 13/17] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230825.26 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.111 -> To Version 7.0.111 --- NuGet.config | 4 ++-- eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 4 ++-- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/NuGet.config b/NuGet.config index 2b6b9e39f..12126931d 100644 --- a/NuGet.config +++ b/NuGet.config @@ -19,7 +19,7 @@ <add key="darc-int-dotnet-runtime-ecb34f8" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-ecb34f85/nuget/v3/index.json" /> <!-- End: Package sources from dotnet-runtime --> <!-- Begin: Package sources from dotnet-sdk --> - <add key="darc-int-dotnet-sdk-b257a52" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-b257a52f/nuget/v3/index.json" /> + <add key="darc-int-dotnet-sdk-dc70f49" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-dc70f49b/nuget/v3/index.json" /> <!-- End: Package sources from dotnet-sdk --> <!-- Begin: Package sources from dotnet-windowsdesktop --> <add key="darc-int-dotnet-windowsdesktop-721967a" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-721967ad/nuget/v3/index.json" /> @@ -49,7 +49,7 @@ <!-- Begin: Package sources from dotnet-runtime --> <add key="darc-int-dotnet-runtime-ecb34f8" value="true" /> <!-- Begin: Package sources from dotnet-sdk --> - <add key="darc-int-dotnet-sdk-b257a52" value="true" /> + <add key="darc-int-dotnet-sdk-dc70f49" value="true" /> <!-- End: Package sources from dotnet-sdk --> <!-- Begin: Package sources from dotnet-windowsdesktop --> <add key="darc-int-dotnet-windowsdesktop-721967a" value="true" /> diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 17b26bbe8..ae925414b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,20 +100,20 @@ </Dependency> <Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="7.0.111"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri> - <Sha>b257a52f3e0245203a2888dcbdd46c99be86bf56</Sha> + <Sha>dc70f49b6fdb704c917f130aea5a13c18d975207</Sha> </Dependency> - <Dependency Name="Microsoft.TemplateEngine.Cli" Version="7.0.111-servicing.23425.22"> + <Dependency Name="Microsoft.TemplateEngine.Cli" Version="7.0.111-servicing.23425.26"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri> - <Sha>b257a52f3e0245203a2888dcbdd46c99be86bf56</Sha> + <Sha>dc70f49b6fdb704c917f130aea5a13c18d975207</Sha> </Dependency> - <Dependency Name="Microsoft.NET.Sdk" Version="7.0.111-servicing.23425.22"> + <Dependency Name="Microsoft.NET.Sdk" Version="7.0.111-servicing.23425.26"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri> - <Sha>b257a52f3e0245203a2888dcbdd46c99be86bf56</Sha> + <Sha>dc70f49b6fdb704c917f130aea5a13c18d975207</Sha> <SourceBuild RepoName="sdk" ManagedOnly="true" /> </Dependency> - <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="7.0.111-servicing.23425.22"> + <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="7.0.111-servicing.23425.26"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri> - <Sha>b257a52f3e0245203a2888dcbdd46c99be86bf56</Sha> + <Sha>dc70f49b6fdb704c917f130aea5a13c18d975207</Sha> </Dependency> <!-- For coherency purposes, these versions should be gated by the versions of winforms and wpf routed via windowsdesktop --> <Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="7.0.11-servicing.23422.3" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64"> diff --git a/eng/Versions.props b/eng/Versions.props index 21b3651b2..ec11b8211 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -70,8 +70,8 @@ <PropertyGroup> <!-- Dependencies from https://github.com/dotnet/sdk --> <MicrosoftDotNetCommonItemTemplatesPackageVersion>7.0.111</MicrosoftDotNetCommonItemTemplatesPackageVersion> - <MicrosoftNETSdkPackageVersion>7.0.111-servicing.23425.22</MicrosoftNETSdkPackageVersion> - <MicrosoftDotNetMSBuildSdkResolverPackageVersion>7.0.111-servicing.23425.22</MicrosoftDotNetMSBuildSdkResolverPackageVersion> + <MicrosoftNETSdkPackageVersion>7.0.111-servicing.23425.26</MicrosoftNETSdkPackageVersion> + <MicrosoftDotNetMSBuildSdkResolverPackageVersion>7.0.111-servicing.23425.26</MicrosoftDotNetMSBuildSdkResolverPackageVersion> <MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion> <MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion> <MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion> From 288633c161cdacd0c0b2d88d7b81e4a036d9bb55 Mon Sep 17 00:00:00 2001 From: DotNet-Bot <dn-bot@microsoft.com> Date: Fri, 25 Aug 2023 19:00:22 +0000 Subject: [PATCH 14/17] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230825.35 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.111 -> To Version 7.0.111 Dependency coherency updates Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets From Version 7.0.11 -> To Version 7.0.11 (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 12126931d..d8eb87349 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ <clear /> <!--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-cf068f2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-cf068f24/nuget/v3/index.json" /> + <add key="darc-int-dotnet-aspnetcore-70048be" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-70048bee/nuget/v3/index.json" /> <!-- End: Package sources from dotnet-aspnetcore --> <!-- Begin: Package sources from dotnet-emsdk --> <add key="darc-pub-dotnet-emsdk-79b01e4" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-79b01e47/nuget/v3/index.json" /> @@ -19,7 +19,7 @@ <add key="darc-int-dotnet-runtime-ecb34f8" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-ecb34f85/nuget/v3/index.json" /> <!-- End: Package sources from dotnet-runtime --> <!-- Begin: Package sources from dotnet-sdk --> - <add key="darc-int-dotnet-sdk-dc70f49" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-dc70f49b/nuget/v3/index.json" /> + <add key="darc-int-dotnet-sdk-d52e32c" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-d52e32cd/nuget/v3/index.json" /> <!-- End: Package sources from dotnet-sdk --> <!-- Begin: Package sources from dotnet-windowsdesktop --> <add key="darc-int-dotnet-windowsdesktop-721967a" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-721967ad/nuget/v3/index.json" /> @@ -44,12 +44,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-cf068f2" value="true" /> + <add key="darc-int-dotnet-aspnetcore-70048be" value="true" /> <!-- End: Package sources from dotnet-aspnetcore --> <!-- Begin: Package sources from dotnet-runtime --> <add key="darc-int-dotnet-runtime-ecb34f8" value="true" /> <!-- Begin: Package sources from dotnet-sdk --> - <add key="darc-int-dotnet-sdk-dc70f49" value="true" /> + <add key="darc-int-dotnet-sdk-d52e32c" value="true" /> <!-- End: Package sources from dotnet-sdk --> <!-- Begin: Package sources from dotnet-windowsdesktop --> <add key="darc-int-dotnet-windowsdesktop-721967a" value="true" /> diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ae925414b..e1815d754 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,32 +54,32 @@ </Dependency> <Dependency Name="Microsoft.AspNetCore.App.Ref" Version="7.0.11" CoherentParentDependency="Microsoft.NET.Sdk"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri> - <Sha>cf068f24c37b6166910886b26bde7bd32bf71259</Sha> + <Sha>70048beee894074e9718206a0017d9b080ee66ff</Sha> </Dependency> - <Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="7.0.11-servicing.23422.8" CoherentParentDependency="Microsoft.NET.Sdk"> + <Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="7.0.11-servicing.23425.2" CoherentParentDependency="Microsoft.NET.Sdk"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri> - <Sha>cf068f24c37b6166910886b26bde7bd32bf71259</Sha> + <Sha>70048beee894074e9718206a0017d9b080ee66ff</Sha> <SourceBuild RepoName="aspnetcore" ManagedOnly="true" /> </Dependency> <Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="7.0.11" CoherentParentDependency="Microsoft.NET.Sdk"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri> - <Sha>cf068f24c37b6166910886b26bde7bd32bf71259</Sha> + <Sha>70048beee894074e9718206a0017d9b080ee66ff</Sha> </Dependency> - <Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0" Version="7.0.11-servicing.23422.8" CoherentParentDependency="Microsoft.NET.Sdk"> + <Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0" Version="7.0.11-servicing.23425.2" CoherentParentDependency="Microsoft.NET.Sdk"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri> - <Sha>cf068f24c37b6166910886b26bde7bd32bf71259</Sha> + <Sha>70048beee894074e9718206a0017d9b080ee66ff</Sha> </Dependency> - <Dependency Name="dotnet-dev-certs" Version="7.0.11-servicing.23422.8" CoherentParentDependency="Microsoft.NET.Sdk"> + <Dependency Name="dotnet-dev-certs" Version="7.0.11-servicing.23425.2" CoherentParentDependency="Microsoft.NET.Sdk"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri> - <Sha>cf068f24c37b6166910886b26bde7bd32bf71259</Sha> + <Sha>70048beee894074e9718206a0017d9b080ee66ff</Sha> </Dependency> - <Dependency Name="dotnet-user-jwts" Version="7.0.11-servicing.23422.8" CoherentParentDependency="Microsoft.NET.Sdk"> + <Dependency Name="dotnet-user-jwts" Version="7.0.11-servicing.23425.2" CoherentParentDependency="Microsoft.NET.Sdk"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri> - <Sha>cf068f24c37b6166910886b26bde7bd32bf71259</Sha> + <Sha>70048beee894074e9718206a0017d9b080ee66ff</Sha> </Dependency> - <Dependency Name="dotnet-user-secrets" Version="7.0.11-servicing.23422.8" CoherentParentDependency="Microsoft.NET.Sdk"> + <Dependency Name="dotnet-user-secrets" Version="7.0.11-servicing.23425.2" CoherentParentDependency="Microsoft.NET.Sdk"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri> - <Sha>cf068f24c37b6166910886b26bde7bd32bf71259</Sha> + <Sha>70048beee894074e9718206a0017d9b080ee66ff</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> @@ -100,20 +100,20 @@ </Dependency> <Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="7.0.111"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri> - <Sha>dc70f49b6fdb704c917f130aea5a13c18d975207</Sha> + <Sha>d52e32cde3bfffcdb95d1eb0bc16251a8f3e53d4</Sha> </Dependency> - <Dependency Name="Microsoft.TemplateEngine.Cli" Version="7.0.111-servicing.23425.26"> + <Dependency Name="Microsoft.TemplateEngine.Cli" Version="7.0.111-servicing.23425.35"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri> - <Sha>dc70f49b6fdb704c917f130aea5a13c18d975207</Sha> + <Sha>d52e32cde3bfffcdb95d1eb0bc16251a8f3e53d4</Sha> </Dependency> - <Dependency Name="Microsoft.NET.Sdk" Version="7.0.111-servicing.23425.26"> + <Dependency Name="Microsoft.NET.Sdk" Version="7.0.111-servicing.23425.35"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri> - <Sha>dc70f49b6fdb704c917f130aea5a13c18d975207</Sha> + <Sha>d52e32cde3bfffcdb95d1eb0bc16251a8f3e53d4</Sha> <SourceBuild RepoName="sdk" ManagedOnly="true" /> </Dependency> - <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="7.0.111-servicing.23425.26"> + <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="7.0.111-servicing.23425.35"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri> - <Sha>dc70f49b6fdb704c917f130aea5a13c18d975207</Sha> + <Sha>d52e32cde3bfffcdb95d1eb0bc16251a8f3e53d4</Sha> </Dependency> <!-- For coherency purposes, these versions should be gated by the versions of winforms and wpf routed via windowsdesktop --> <Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="7.0.11-servicing.23422.3" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64"> diff --git a/eng/Versions.props b/eng/Versions.props index ec11b8211..b64511458 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -58,11 +58,11 @@ <!-- Dependencies from https://github.com/aspnet/AspNetCore --> <MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>7.0.11</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion> <MicrosoftAspNetCoreAppRefPackageVersion>7.0.11</MicrosoftAspNetCoreAppRefPackageVersion> - <MicrosoftAspNetCoreAppRefInternalPackageVersion>7.0.11-servicing.23422.8</MicrosoftAspNetCoreAppRefInternalPackageVersion> - <VSRedistCommonAspNetCoreSharedFrameworkx6470PackageVersion>7.0.11-servicing.23422.8</VSRedistCommonAspNetCoreSharedFrameworkx6470PackageVersion> - <dotnetdevcertsPackageVersion>7.0.11-servicing.23422.8</dotnetdevcertsPackageVersion> - <dotnetuserjwtsPackageVersion>7.0.11-servicing.23422.8</dotnetuserjwtsPackageVersion> - <dotnetusersecretsPackageVersion>7.0.11-servicing.23422.8</dotnetusersecretsPackageVersion> + <MicrosoftAspNetCoreAppRefInternalPackageVersion>7.0.11-servicing.23425.2</MicrosoftAspNetCoreAppRefInternalPackageVersion> + <VSRedistCommonAspNetCoreSharedFrameworkx6470PackageVersion>7.0.11-servicing.23425.2</VSRedistCommonAspNetCoreSharedFrameworkx6470PackageVersion> + <dotnetdevcertsPackageVersion>7.0.11-servicing.23425.2</dotnetdevcertsPackageVersion> + <dotnetuserjwtsPackageVersion>7.0.11-servicing.23425.2</dotnetuserjwtsPackageVersion> + <dotnetusersecretsPackageVersion>7.0.11-servicing.23425.2</dotnetusersecretsPackageVersion> </PropertyGroup> <PropertyGroup> <MicroBuildCorePackageVersion>0.2.0</MicroBuildCorePackageVersion> @@ -70,8 +70,8 @@ <PropertyGroup> <!-- Dependencies from https://github.com/dotnet/sdk --> <MicrosoftDotNetCommonItemTemplatesPackageVersion>7.0.111</MicrosoftDotNetCommonItemTemplatesPackageVersion> - <MicrosoftNETSdkPackageVersion>7.0.111-servicing.23425.26</MicrosoftNETSdkPackageVersion> - <MicrosoftDotNetMSBuildSdkResolverPackageVersion>7.0.111-servicing.23425.26</MicrosoftDotNetMSBuildSdkResolverPackageVersion> + <MicrosoftNETSdkPackageVersion>7.0.111-servicing.23425.35</MicrosoftNETSdkPackageVersion> + <MicrosoftDotNetMSBuildSdkResolverPackageVersion>7.0.111-servicing.23425.35</MicrosoftDotNetMSBuildSdkResolverPackageVersion> <MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion> <MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion> <MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion> From 8ccd8a807f77ab0d1daf6a9d8c5a2e957e00b041 Mon Sep 17 00:00:00 2001 From: DotNet-Bot <dn-bot@microsoft.com> Date: Fri, 25 Aug 2023 21:46:55 +0000 Subject: [PATCH 15/17] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230825.44 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.111 -> To Version 7.0.111 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates From Version 7.0.11 -> To Version 7.0.11 (parent: Microsoft.NET.Sdk --- NuGet.config | 8 ++++---- eng/Version.Details.xml | 34 +++++++++++++++++----------------- eng/Versions.props | 12 ++++++------ 3 files changed, 27 insertions(+), 27 deletions(-) diff --git a/NuGet.config b/NuGet.config index d8eb87349..ea2adade5 100644 --- a/NuGet.config +++ b/NuGet.config @@ -19,10 +19,10 @@ <add key="darc-int-dotnet-runtime-ecb34f8" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-ecb34f85/nuget/v3/index.json" /> <!-- End: Package sources from dotnet-runtime --> <!-- Begin: Package sources from dotnet-sdk --> - <add key="darc-int-dotnet-sdk-d52e32c" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-d52e32cd/nuget/v3/index.json" /> + <add key="darc-int-dotnet-sdk-d0b45a0" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-d0b45a00/nuget/v3/index.json" /> <!-- End: Package sources from dotnet-sdk --> <!-- Begin: Package sources from dotnet-windowsdesktop --> - <add key="darc-int-dotnet-windowsdesktop-721967a" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-721967ad/nuget/v3/index.json" /> + <add key="darc-int-dotnet-windowsdesktop-b193aa2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-b193aa2e/nuget/v3/index.json" /> <!-- End: Package sources from dotnet-windowsdesktop --> <!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.--> <add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" /> @@ -49,10 +49,10 @@ <!-- Begin: Package sources from dotnet-runtime --> <add key="darc-int-dotnet-runtime-ecb34f8" value="true" /> <!-- Begin: Package sources from dotnet-sdk --> - <add key="darc-int-dotnet-sdk-d52e32c" value="true" /> + <add key="darc-int-dotnet-sdk-d0b45a0" value="true" /> <!-- End: Package sources from dotnet-sdk --> <!-- Begin: Package sources from dotnet-windowsdesktop --> - <add key="darc-int-dotnet-windowsdesktop-721967a" value="true" /> + <add key="darc-int-dotnet-windowsdesktop-b193aa2" value="true" /> <!-- End: Package sources from dotnet-windowsdesktop --> <!-- End: Package sources from dotnet-runtime --> <!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.--> diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e1815d754..9253d3890 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ <ProductDependencies> <Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="7.0.11" CoherentParentDependency="Microsoft.NET.Sdk"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri> - <Sha>721967ad57b950287505e20f9953ff14b9a10485</Sha> + <Sha>b193aa2e8630cef7ac1d858be3677b0c129e2faf</Sha> </Dependency> - <Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0" Version="7.0.11-servicing.23422.3" CoherentParentDependency="Microsoft.NET.Sdk"> + <Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0" Version="7.0.11-servicing.23425.5" CoherentParentDependency="Microsoft.NET.Sdk"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri> - <Sha>721967ad57b950287505e20f9953ff14b9a10485</Sha> + <Sha>b193aa2e8630cef7ac1d858be3677b0c129e2faf</Sha> </Dependency> - <Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0" Version="7.0.11-servicing.23422.3" CoherentParentDependency="Microsoft.NET.Sdk"> + <Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0" Version="7.0.11-servicing.23425.5" CoherentParentDependency="Microsoft.NET.Sdk"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri> - <Sha>721967ad57b950287505e20f9953ff14b9a10485</Sha> + <Sha>b193aa2e8630cef7ac1d858be3677b0c129e2faf</Sha> </Dependency> <Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="7.0.11" CoherentParentDependency="Microsoft.NET.Sdk"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri> - <Sha>721967ad57b950287505e20f9953ff14b9a10485</Sha> + <Sha>b193aa2e8630cef7ac1d858be3677b0c129e2faf</Sha> </Dependency> <Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.7.0" Version="7.0.11-servicing.23424.27" CoherentParentDependency="Microsoft.NET.Sdk"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> @@ -100,29 +100,29 @@ </Dependency> <Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="7.0.111"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri> - <Sha>d52e32cde3bfffcdb95d1eb0bc16251a8f3e53d4</Sha> + <Sha>d0b45a002cc72d1932d7c1a6a87482bac3518c5d</Sha> </Dependency> - <Dependency Name="Microsoft.TemplateEngine.Cli" Version="7.0.111-servicing.23425.35"> + <Dependency Name="Microsoft.TemplateEngine.Cli" Version="7.0.111-servicing.23425.44"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri> - <Sha>d52e32cde3bfffcdb95d1eb0bc16251a8f3e53d4</Sha> + <Sha>d0b45a002cc72d1932d7c1a6a87482bac3518c5d</Sha> </Dependency> - <Dependency Name="Microsoft.NET.Sdk" Version="7.0.111-servicing.23425.35"> + <Dependency Name="Microsoft.NET.Sdk" Version="7.0.111-servicing.23425.44"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri> - <Sha>d52e32cde3bfffcdb95d1eb0bc16251a8f3e53d4</Sha> + <Sha>d0b45a002cc72d1932d7c1a6a87482bac3518c5d</Sha> <SourceBuild RepoName="sdk" ManagedOnly="true" /> </Dependency> - <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="7.0.111-servicing.23425.35"> + <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="7.0.111-servicing.23425.44"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri> - <Sha>d52e32cde3bfffcdb95d1eb0bc16251a8f3e53d4</Sha> + <Sha>d0b45a002cc72d1932d7c1a6a87482bac3518c5d</Sha> </Dependency> <!-- For coherency purposes, these versions should be gated by the versions of winforms and wpf routed via windowsdesktop --> - <Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="7.0.11-servicing.23422.3" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64"> + <Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="7.0.11-servicing.23425.2" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-winforms</Uri> - <Sha>81760b1e789d848e1c44733615cf2939159603a3</Sha> + <Sha>66db733312de7bd21ed3e73cee0b27fb75d91b70</Sha> </Dependency> - <Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="7.0.11-servicing.23422.2" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64"> + <Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="7.0.11-servicing.23425.6" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri> - <Sha>aea83fde388f1f90c7068116c2653b12e31bac40</Sha> + <Sha>6432861c5a360348a9e1a6cc76cced7bd25ab3f9</Sha> </Dependency> <Dependency Name="Microsoft.FSharp.Compiler" Version="12.4.0-beta.22571.5" CoherentParentDependency="Microsoft.NET.Sdk"> <Uri>https://github.com/dotnet/fsharp</Uri> diff --git a/eng/Versions.props b/eng/Versions.props index b64511458..6398d4c16 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,11 +37,11 @@ </PropertyGroup> <PropertyGroup> <!-- Dependency from https://github.com/dotnet/winforms --> - <MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>7.0.11-servicing.23422.3</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion> + <MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>7.0.11-servicing.23425.2</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion> </PropertyGroup> <PropertyGroup> <!-- Dependency from https://github.com/dotnet/wpf --> - <MicrosoftDotNetWpfProjectTemplatesPackageVersion>7.0.11-servicing.23422.2</MicrosoftDotNetWpfProjectTemplatesPackageVersion> + <MicrosoftDotNetWpfProjectTemplatesPackageVersion>7.0.11-servicing.23425.6</MicrosoftDotNetWpfProjectTemplatesPackageVersion> </PropertyGroup> <PropertyGroup> <!-- Dependency from https://github.com/dotnet/test-templates --> @@ -70,8 +70,8 @@ <PropertyGroup> <!-- Dependencies from https://github.com/dotnet/sdk --> <MicrosoftDotNetCommonItemTemplatesPackageVersion>7.0.111</MicrosoftDotNetCommonItemTemplatesPackageVersion> - <MicrosoftNETSdkPackageVersion>7.0.111-servicing.23425.35</MicrosoftNETSdkPackageVersion> - <MicrosoftDotNetMSBuildSdkResolverPackageVersion>7.0.111-servicing.23425.35</MicrosoftDotNetMSBuildSdkResolverPackageVersion> + <MicrosoftNETSdkPackageVersion>7.0.111-servicing.23425.44</MicrosoftNETSdkPackageVersion> + <MicrosoftDotNetMSBuildSdkResolverPackageVersion>7.0.111-servicing.23425.44</MicrosoftDotNetMSBuildSdkResolverPackageVersion> <MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion> <MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion> <MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion> @@ -92,8 +92,8 @@ </PropertyGroup> <PropertyGroup> <!-- Dependencies from https://github.com/dotnet/windowsdesktop --> - <VSRedistCommonWindowsDesktopSharedFrameworkx6470PackageVersion>7.0.11-servicing.23422.3</VSRedistCommonWindowsDesktopSharedFrameworkx6470PackageVersion> - <VSRedistCommonWindowsDesktopTargetingPackx6470PackageVersion>7.0.11-servicing.23422.3</VSRedistCommonWindowsDesktopTargetingPackx6470PackageVersion> + <VSRedistCommonWindowsDesktopSharedFrameworkx6470PackageVersion>7.0.11-servicing.23425.5</VSRedistCommonWindowsDesktopSharedFrameworkx6470PackageVersion> + <VSRedistCommonWindowsDesktopTargetingPackx6470PackageVersion>7.0.11-servicing.23425.5</VSRedistCommonWindowsDesktopTargetingPackx6470PackageVersion> <MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>7.0.11</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion> <MicrosoftWindowsDesktopAppRefPackageVersion>7.0.11</MicrosoftWindowsDesktopAppRefPackageVersion> </PropertyGroup> From 529188e483f3634a687c4df353364a812c245e2b Mon Sep 17 00:00:00 2001 From: Sean Reeser <v-seanreeser@microsoft.com> Date: Thu, 31 Aug 2023 11:27:03 -0700 Subject: [PATCH 16/17] Update branding to 7.0.112 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index f9f9cd5e4..c64853195 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ <VersionMajor>7</VersionMajor> <VersionMinor>0</VersionMinor> <VersionSDKMinor>1</VersionSDKMinor> - <VersionFeature>11</VersionFeature> + <VersionFeature>12</VersionFeature> <VersionPrefix>$(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature)</VersionPrefix> <PreReleaseVersionLabel>servicing</PreReleaseVersionLabel> <PreReleaseVersionIteration> From 0c7d38132a88882f78951734fed1b02a567381da Mon Sep 17 00:00:00 2001 From: NET Source-Build Bot <102560831+dotnet-sb-bot@users.noreply.github.com> Date: Tue, 12 Sep 2023 16:06:51 -0500 Subject: [PATCH 17/17] .NET Source-Build 7.0.111 September 2023 Updates (#17341) --- eng/Versions.props | 4 ++-- src/SourceBuild/tarball/content/global.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index a2a75258d..12b8f2cd7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -215,8 +215,8 @@ or minor release, prebuilts may be needed. When the release is mature, prebuilts are not necessary, and this property is removed from the file. --> - <PrivateSourceBuiltSDKVersion>7.0.110</PrivateSourceBuiltSDKVersion> - <PrivateSourceBuiltArtifactsPackageVersion>7.0.110</PrivateSourceBuiltArtifactsPackageVersion> + <PrivateSourceBuiltSDKVersion>7.0.111</PrivateSourceBuiltSDKVersion> + <PrivateSourceBuiltArtifactsPackageVersion>7.0.111</PrivateSourceBuiltArtifactsPackageVersion> </PropertyGroup> <!-- Workload manifest package versions --> <PropertyGroup> diff --git a/src/SourceBuild/tarball/content/global.json b/src/SourceBuild/tarball/content/global.json index f8dc920b3..654f89210 100644 --- a/src/SourceBuild/tarball/content/global.json +++ b/src/SourceBuild/tarball/content/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "7.0.110" + "dotnet": "7.0.111" }, "msbuild-sdks": { "Microsoft.Build.CentralPackageVersions": "2.0.1",