From 00b88d5868d661b01868eb3af5eee63ab97b7cba Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 17 Jul 2022 15:44:52 +0000 Subject: [PATCH] Update dependencies from https://github.com/dotnet/sdk build 20220717.2 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 7.0.100-rc.1.22365.4 -> To Version 7.0.100-rc.1.22367.2 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.NETCore.Platforms,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,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.Manifest-7.0.100 From Version 7.0.0-rc.1.22363.11 -> To Version 7.0.0-rc.1.22366.1 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 12 ++++++------ 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index caad4faa9..ce708aca2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,21 +1,21 @@ <?xml version="1.0" encoding="utf-8"?> <Dependencies> <ProductDependencies> - <Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="7.0.0-rc.1.22364.7" CoherentParentDependency="Microsoft.NET.Sdk"> + <Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="7.0.0-rc.1.22366.1" CoherentParentDependency="Microsoft.NET.Sdk"> <Uri>https://github.com/dotnet/windowsdesktop</Uri> - <Sha>1da2fba9ca04befba63f145affd31aa790997713</Sha> + <Sha>72e09152a35ce78eb06abf2c8c3971ab43817069</Sha> </Dependency> - <Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0" Version="7.0.0-rc.1.22364.7" CoherentParentDependency="Microsoft.NET.Sdk"> + <Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0" Version="7.0.0-rc.1.22366.1" CoherentParentDependency="Microsoft.NET.Sdk"> <Uri>https://github.com/dotnet/windowsdesktop</Uri> - <Sha>1da2fba9ca04befba63f145affd31aa790997713</Sha> + <Sha>72e09152a35ce78eb06abf2c8c3971ab43817069</Sha> </Dependency> - <Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0" Version="7.0.0-rc.1.22364.7" CoherentParentDependency="Microsoft.NET.Sdk"> + <Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0" Version="7.0.0-rc.1.22366.1" CoherentParentDependency="Microsoft.NET.Sdk"> <Uri>https://github.com/dotnet/windowsdesktop</Uri> - <Sha>1da2fba9ca04befba63f145affd31aa790997713</Sha> + <Sha>72e09152a35ce78eb06abf2c8c3971ab43817069</Sha> </Dependency> - <Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="7.0.0-rc.1.22364.7" CoherentParentDependency="Microsoft.NET.Sdk"> + <Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="7.0.0-rc.1.22366.1" CoherentParentDependency="Microsoft.NET.Sdk"> <Uri>https://github.com/dotnet/windowsdesktop</Uri> - <Sha>1da2fba9ca04befba63f145affd31aa790997713</Sha> + <Sha>72e09152a35ce78eb06abf2c8c3971ab43817069</Sha> </Dependency> <Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.7.0" Version="7.0.0-rc.1.22364.7" CoherentParentDependency="Microsoft.NET.Sdk"> <Uri>https://github.com/dotnet/runtime</Uri> @@ -107,14 +107,14 @@ <Sha>a87219b0c6de7c07cce71ccc3b3548a2ece6960a</Sha> <SourceBuild RepoName="templating" ManagedOnly="true" /> </Dependency> - <Dependency Name="Microsoft.NET.Sdk" Version="7.0.100-rc.1.22367.1"> + <Dependency Name="Microsoft.NET.Sdk" Version="7.0.100-rc.1.22367.2"> <Uri>https://github.com/dotnet/sdk</Uri> - <Sha>0c0f4eb5962ca436b087482e834be512d598480a</Sha> + <Sha>05a34a88831a0da9298e51731aa1a7c422d87bc6</Sha> <SourceBuild RepoName="sdk" ManagedOnly="true" /> </Dependency> - <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="7.0.100-rc.1.22367.1"> + <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="7.0.100-rc.1.22367.2"> <Uri>https://github.com/dotnet/sdk</Uri> - <Sha>0c0f4eb5962ca436b087482e834be512d598480a</Sha> + <Sha>05a34a88831a0da9298e51731aa1a7c422d87bc6</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.0-rc.1.22364.3" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64"> @@ -125,13 +125,13 @@ <Uri>https://github.com/dotnet/wpf</Uri> <Sha>68c8848c2904a237a03b08ba3b76f81ce20d60e2</Sha> </Dependency> - <Dependency Name="Microsoft.FSharp.Compiler" Version="12.0.4-beta.22364.2" CoherentParentDependency="Microsoft.NET.Sdk"> + <Dependency Name="Microsoft.FSharp.Compiler" Version="12.0.6-beta.22366.1" CoherentParentDependency="Microsoft.NET.Sdk"> <Uri>https://github.com/dotnet/fsharp</Uri> - <Sha>7798a8ece5905ef2a7365e85655c53636dedd3a5</Sha> + <Sha>e4ef7b3d8b923e0d9b700dd48b2c22e8a7980a06</Sha> </Dependency> - <Dependency Name="Microsoft.SourceBuild.Intermediate.fsharp" Version="6.0.5-beta.22364.2" CoherentParentDependency="Microsoft.NET.Sdk"> + <Dependency Name="Microsoft.SourceBuild.Intermediate.fsharp" Version="6.0.6-beta.22366.1" CoherentParentDependency="Microsoft.NET.Sdk"> <Uri>https://github.com/dotnet/fsharp</Uri> - <Sha>7798a8ece5905ef2a7365e85655c53636dedd3a5</Sha> + <Sha>e4ef7b3d8b923e0d9b700dd48b2c22e8a7980a06</Sha> <SourceBuild RepoName="fsharp" ManagedOnly="true" /> </Dependency> <Dependency Name="Microsoft.NET.Test.Sdk" Version="17.4.0-preview-20220715-02" CoherentParentDependency="Microsoft.NET.Sdk"> diff --git a/eng/Versions.props b/eng/Versions.props index 8e2a9acf5..97dab48fb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -65,8 +65,8 @@ </PropertyGroup> <PropertyGroup> <!-- Dependencies from https://github.com/dotnet/sdk --> - <MicrosoftNETSdkPackageVersion>7.0.100-rc.1.22367.1</MicrosoftNETSdkPackageVersion> - <MicrosoftDotNetMSBuildSdkResolverPackageVersion>7.0.100-rc.1.22367.1</MicrosoftDotNetMSBuildSdkResolverPackageVersion> + <MicrosoftNETSdkPackageVersion>7.0.100-rc.1.22367.2</MicrosoftNETSdkPackageVersion> + <MicrosoftDotNetMSBuildSdkResolverPackageVersion>7.0.100-rc.1.22367.2</MicrosoftDotNetMSBuildSdkResolverPackageVersion> <MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion> <MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion> <MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion> @@ -87,10 +87,10 @@ </PropertyGroup> <PropertyGroup> <!-- Dependencies from https://github.com/dotnet/windowsdesktop --> - <VSRedistCommonWindowsDesktopSharedFrameworkx6470PackageVersion>7.0.0-rc.1.22364.7</VSRedistCommonWindowsDesktopSharedFrameworkx6470PackageVersion> - <VSRedistCommonWindowsDesktopTargetingPackx6470PackageVersion>7.0.0-rc.1.22364.7</VSRedistCommonWindowsDesktopTargetingPackx6470PackageVersion> - <MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>7.0.0-rc.1.22364.7</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion> - <MicrosoftWindowsDesktopAppRefPackageVersion>7.0.0-rc.1.22364.7</MicrosoftWindowsDesktopAppRefPackageVersion> + <VSRedistCommonWindowsDesktopSharedFrameworkx6470PackageVersion>7.0.0-rc.1.22366.1</VSRedistCommonWindowsDesktopSharedFrameworkx6470PackageVersion> + <VSRedistCommonWindowsDesktopTargetingPackx6470PackageVersion>7.0.0-rc.1.22366.1</VSRedistCommonWindowsDesktopTargetingPackx6470PackageVersion> + <MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>7.0.0-rc.1.22366.1</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion> + <MicrosoftWindowsDesktopAppRefPackageVersion>7.0.0-rc.1.22366.1</MicrosoftWindowsDesktopAppRefPackageVersion> </PropertyGroup> <PropertyGroup> <!-- Runtime and Apphost pack versions are the same for all RIDs. We flow the x64 -->