From 0421560131e752758c8c03289a41d4b143a5cf16 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 18 Jul 2022 10:33:49 -0500 Subject: [PATCH 01/11] [release/7.0.1xx-preview7] Update dependencies from dotnet/sdk (#14124) * Update dependencies from https://github.com/dotnet/sdk build 20220713.1 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 7.0.100-preview.7.22358.1 -> To Version 7.0.100-preview.7.22363.1 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.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,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,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.Manifest-7.0.100 From Version 7.0.0-preview.7.22355.1 -> To Version 7.0.0-preview.7.22362.6 (parent: Microsoft.NET.Sdk * source-build patch updates * Revert aspnetcore SDK update commit * Add aspnetcore patch for lifetime scope * Update dependencies from https://github.com/dotnet/sdk build 20220713.50 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 7.0.100-preview.7.22358.1 -> To Version 7.0.100-preview.7.22363.50 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.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,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-preview.7.22355.1 -> To Version 7.0.0-preview.7.22362.6 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20220714.2 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 7.0.100-preview.7.22358.1 -> To Version 7.0.100-preview.7.22364.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.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,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-preview.7.22355.1 -> To Version 7.0.0-preview.7.22362.6 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20220714.9 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 7.0.100-preview.7.22358.1 -> To Version 7.0.100-preview.7.22364.9 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.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,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-preview.7.22355.1 -> To Version 7.0.0-preview.7.22362.6 (parent: Microsoft.NET.Sdk * Add runtime patch that removes duplicated Roslyn functionality * Revert "Add runtime patch that removes duplicated Roslyn functionality" This reverts commit 6b734a6c04719e41e46d57b881d375fbe64bcc02. * Add patch for using Roslyn API instead of polyfill in runtime * Rebase patch on correct commit * Update dependencies from https://github.com/dotnet/sdk build 20220714.22 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 7.0.100-preview.7.22358.1 -> To Version 7.0.100-preview.7.22364.22 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.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,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-preview.7.22355.1 -> To Version 7.0.0-preview.7.22364.4 (parent: Microsoft.NET.Sdk * Add runtime patch to fully qualify conflicting runtime and roslyn APIs * Add aspnetcore patch to react to QUIC API changes * Add comments to new patches. * Update dependencies from https://github.com/dotnet/sdk build 20220714.33 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 7.0.100-preview.7.22358.1 -> To Version 7.0.100-preview.7.22364.33 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.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,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-preview.7.22355.1 -> To Version 7.0.0-preview.7.22364.4 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20220714.35 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 7.0.100-preview.7.22358.1 -> To Version 7.0.100-preview.7.22364.35 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.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,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-preview.7.22355.1 -> To Version 7.0.0-preview.7.22364.4 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20220715.3 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 7.0.100-preview.7.22358.1 -> To Version 7.0.100-preview.7.22365.3 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.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,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-preview.7.22355.1 -> To Version 7.0.0-preview.7.22364.4 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20220715.6 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 7.0.100-preview.7.22358.1 -> To Version 7.0.100-preview.7.22365.6 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.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,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-preview.7.22355.1 -> To Version 7.0.0-preview.7.22364.4 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20220715.12 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 7.0.100-preview.7.22358.1 -> To Version 7.0.100-preview.7.22365.12 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.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,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-preview.7.22355.1 -> To Version 7.0.0-preview.7.22364.4 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20220715.24 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 7.0.100-preview.7.22358.1 -> To Version 7.0.100-preview.7.22365.24 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.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,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-preview.7.22355.1 -> To Version 7.0.0-preview.7.22364.4 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20220715.26 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 7.0.100-preview.7.22358.1 -> To Version 7.0.100-preview.7.22365.26 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.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,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-preview.7.22355.1 -> To Version 7.0.0-preview.7.22364.4 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20220716.5 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 7.0.100-preview.7.22358.1 -> To Version 7.0.100-preview.7.22366.5 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.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,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-preview.7.22355.1 -> To Version 7.0.0-preview.7.22364.4 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20220718.2 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 7.0.100-preview.7.22358.1 -> To Version 7.0.100-preview.7.22368.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.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,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-preview.7.22355.1 -> To Version 7.0.0-preview.7.22364.4 (parent: Microsoft.NET.Sdk * Remove aspnetcore source-build patch that flowed in Co-authored-by: dotnet-maestro[bot] Co-authored-by: MichaelSimons Co-authored-by: Logan Bussell --- eng/Version.Details.xml | 128 ++++++++-------- eng/Versions.props | 50 +++--- ...rastructure-Update-SDK-version-42571.patch | 35 +++++ .../0004-Apply-lifetime-scoped-to-API.patch | 22 +++ ...ft.Win32.Registry-reference-to-5.0.0.patch | 23 --- .../patches/fsharp/0002-fix-13174.patch | 145 ------------------ ...ilt-assets-during-source-build-for-r.patch | 2 +- ...-conflicting-runtime-and-roslyn-APIs.patch | 44 ++++++ 8 files changed, 191 insertions(+), 258 deletions(-) create mode 100644 src/SourceBuild/tarball/patches/aspnetcore/0003-Revert-Infrastructure-Update-SDK-version-42571.patch create mode 100644 src/SourceBuild/tarball/patches/aspnetcore/0004-Apply-lifetime-scoped-to-API.patch delete mode 100644 src/SourceBuild/tarball/patches/fsharp/0001-Upgrade-Microsoft.Win32.Registry-reference-to-5.0.0.patch delete mode 100644 src/SourceBuild/tarball/patches/fsharp/0002-fix-13174.patch create mode 100644 src/SourceBuild/tarball/patches/runtime/0003-Fully-qualify-conflicting-runtime-and-roslyn-APIs.patch diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d379c5ddf40d..93b8a9a6cc25 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://github.com/dotnet/windowsdesktop - 706393353488ce178488e8de342599414c29d8c7 + 3933a4f6ac2d00bf27849014582abe46d4165e54 - + https://github.com/dotnet/windowsdesktop - 706393353488ce178488e8de342599414c29d8c7 + 3933a4f6ac2d00bf27849014582abe46d4165e54 - + https://github.com/dotnet/windowsdesktop - 706393353488ce178488e8de342599414c29d8c7 + 3933a4f6ac2d00bf27849014582abe46d4165e54 - + https://github.com/dotnet/windowsdesktop - 706393353488ce178488e8de342599414c29d8c7 + 3933a4f6ac2d00bf27849014582abe46d4165e54 - + https://github.com/dotnet/runtime - 206dccb7945aaa3f26599fbe742de9022ca7ef91 + 3b0a07539792515b4fc4dc8b1b41c47ea594a0bb - + https://github.com/dotnet/runtime - 206dccb7945aaa3f26599fbe742de9022ca7ef91 + 3b0a07539792515b4fc4dc8b1b41c47ea594a0bb - + https://github.com/dotnet/runtime - 206dccb7945aaa3f26599fbe742de9022ca7ef91 + 3b0a07539792515b4fc4dc8b1b41c47ea594a0bb - + https://github.com/dotnet/runtime - 206dccb7945aaa3f26599fbe742de9022ca7ef91 + 3b0a07539792515b4fc4dc8b1b41c47ea594a0bb - + https://github.com/dotnet/runtime - 206dccb7945aaa3f26599fbe742de9022ca7ef91 + 3b0a07539792515b4fc4dc8b1b41c47ea594a0bb - + https://github.com/dotnet/runtime - 206dccb7945aaa3f26599fbe742de9022ca7ef91 + 3b0a07539792515b4fc4dc8b1b41c47ea594a0bb @@ -48,38 +48,38 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 206dccb7945aaa3f26599fbe742de9022ca7ef91 + 3b0a07539792515b4fc4dc8b1b41c47ea594a0bb - + https://github.com/dotnet/aspnetcore - 5c3a312e6c8798efb62b9b5ccd0ea8620be11118 + 44e64ad723c16e7fe39179f6ac3ba67c2396dd13 - + https://github.com/dotnet/aspnetcore - 5c3a312e6c8798efb62b9b5ccd0ea8620be11118 + 44e64ad723c16e7fe39179f6ac3ba67c2396dd13 - + https://github.com/dotnet/aspnetcore - 5c3a312e6c8798efb62b9b5ccd0ea8620be11118 + 44e64ad723c16e7fe39179f6ac3ba67c2396dd13 - + https://github.com/dotnet/aspnetcore - 5c3a312e6c8798efb62b9b5ccd0ea8620be11118 + 44e64ad723c16e7fe39179f6ac3ba67c2396dd13 - + https://github.com/dotnet/aspnetcore - 5c3a312e6c8798efb62b9b5ccd0ea8620be11118 + 44e64ad723c16e7fe39179f6ac3ba67c2396dd13 - + https://github.com/dotnet/aspnetcore - 5c3a312e6c8798efb62b9b5ccd0ea8620be11118 + 44e64ad723c16e7fe39179f6ac3ba67c2396dd13 - + https://github.com/dotnet/aspnetcore - 5c3a312e6c8798efb62b9b5ccd0ea8620be11118 + 44e64ad723c16e7fe39179f6ac3ba67c2396dd13 https://github.com/dotnet/test-templates @@ -98,66 +98,66 @@ 9c5549788cda5238a0e65466cbde9eb4ed42b695 - + https://github.com/dotnet/templating - 0b9b0b4e7abc5d41b6308f91101981b0b21d90f2 + 79a52dd4ffef8f7b6ea6afa4f897e35208408e8b - + https://github.com/dotnet/templating - 0b9b0b4e7abc5d41b6308f91101981b0b21d90f2 + 79a52dd4ffef8f7b6ea6afa4f897e35208408e8b - + https://github.com/dotnet/sdk - 3d459093b37956d9c28be26c0ea9bd181d5dd454 + c93c7fadd3e80fa1f84c6bbed2b0c39c9ca868a3 - + https://github.com/dotnet/sdk - 3d459093b37956d9c28be26c0ea9bd181d5dd454 + c93c7fadd3e80fa1f84c6bbed2b0c39c9ca868a3 - + https://github.com/dotnet/winforms - 5972c29ef057fe95563646f2810735795c899a4f + 83c5b94ebf60fee35418be2f4d00fbe95af17ee5 - + https://github.com/dotnet/wpf - 52db6defd3dc565232e29dc5eb8b8772bd06f175 + 498ca907dd3dd96ef5002c151665a20de6aac343 - + https://github.com/dotnet/fsharp - 702b8e77f5fbfe21e6743324c1750503e02f182d + 1b94f89d4d1f41f20f9be73c76f4b229d4e49078 - + https://github.com/dotnet/fsharp - 702b8e77f5fbfe21e6743324c1750503e02f182d + 1b94f89d4d1f41f20f9be73c76f4b229d4e49078 - + https://github.com/microsoft/vstest - b1452a516a80672fa814f4ebdf2151c0875d0b20 + b2e2126f1aa7e5753cafe9515563c99ade6a59ce - + https://github.com/dotnet/linker - ef2d0f25b72469b55925251a79f12bcbf98644bf + 33a76b856466b96dd3d179e599a7fc0118389641 linker - + https://github.com/dotnet/roslyn - 76aec58b9f6e82be2f7285c488dbb29554c625b1 + 8659bb6911c30a26c813761851ba3c76805c851d - + https://github.com/dotnet/msbuild - 94c28cca4cdb22f2cac279e3fd8d86aa4d061848 + 659a296a34870ea26a1ffa02919d886fd6445e2e - + https://github.com/nuget/nuget.client - 3dd86e0c670862f76351c87ca7dc3454d0faf8d6 + 222ff7a5329be15520034b76fa1a84098d2ae9fd @@ -170,9 +170,9 @@ 698fdad58fa64a55f16cd9562c90224cc498ed02 - + https://github.com/dotnet/emsdk - 40e7c6226711ec616ee07e725563eda708630fe1 + 7d277787570614a3dd99e1d6022375d9ae43e6af https://github.com/dotnet/deployment-tools diff --git a/eng/Versions.props b/eng/Versions.props index 23b98ae60eeb..a63757638fb9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -30,15 +30,15 @@ - 7.0.0-preview.7.22355.1 + 7.0.0-preview.7.22364.2 - 7.0.0-preview.7.22355.1 + 7.0.0-preview.7.22364.2 - 7.0.100-preview.7.22329.2 + 7.0.100-preview.7.22365.2 @@ -52,45 +52,45 @@ - 7.0.0-preview.7.22356.9 - 7.0.0-preview.7.22356.9 - 7.0.0-preview.7.22356.9 - 7.0.0-preview.7.22356.9 - 7.0.0-preview.7.22356.9 - 7.0.0-preview.7.22356.9 - 7.0.0-preview.7.22356.9 + 7.0.0-preview.7.22365.8 + 7.0.0-preview.7.22365.8 + 7.0.0-preview.7.22365.8 + 7.0.0-preview.7.22365.8 + 7.0.0-preview.7.22365.8 + 7.0.0-preview.7.22365.8 + 7.0.0-preview.7.22365.8 0.2.0 - 7.0.100-preview.7.22358.1 - 7.0.100-preview.7.22358.1 + 7.0.100-preview.7.22368.2 + 7.0.100-preview.7.22368.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 7.0.0-preview.6.22356.1 + 7.0.0-preview.7.22364.6 - 7.0.0-preview.6.22356.1 - 7.0.0-preview.6.22356.1 - 7.0.0-preview.6.22356.1 - 7.0.0-preview.6.22356.1 - 7.0.0-preview.6.22356.1 - 7.0.0-preview.6.22356.1 + 7.0.0-preview.7.22364.6 + 7.0.0-preview.7.22364.6 + 7.0.0-preview.7.22364.6 + 7.0.0-preview.7.22364.6 + 7.0.0-preview.7.22364.6 + 7.0.0-preview.7.22364.6 2.1.0 - 7.0.0-preview.7.22355.1 - 7.0.0-preview.7.22355.1 - 7.0.0-preview.7.22355.1 - 7.0.0-preview.7.22355.1 + 7.0.0-preview.7.22364.4 + 7.0.0-preview.7.22364.4 + 7.0.0-preview.7.22364.4 + 7.0.0-preview.7.22364.4 @@ -168,7 +168,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.4.0-preview-20220702-01 + 17.4.0-preview-20220711-01 @@ -201,7 +201,7 @@ 12.3.303 15.4.303 $(MicrosoftNETCoreAppRefPackageVersion) - 7.0.0-preview.7.22330.1 + 7.0.0-preview.7.22361.2 $(MicrosoftNETWorkloadEmscriptenManifest70100Version) diff --git a/src/SourceBuild/tarball/patches/aspnetcore/0003-Revert-Infrastructure-Update-SDK-version-42571.patch b/src/SourceBuild/tarball/patches/aspnetcore/0003-Revert-Infrastructure-Update-SDK-version-42571.patch new file mode 100644 index 000000000000..cd7ba85349ed --- /dev/null +++ b/src/SourceBuild/tarball/patches/aspnetcore/0003-Revert-Infrastructure-Update-SDK-version-42571.patch @@ -0,0 +1,35 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Logan Bussell +Date: Tue, 12 Jul 2022 13:50:55 -0700 +Subject: [PATCH] Revert "[Infrastructure] Update SDK version (#42571)" + +Temporarily rollback https://github.com/dotnet/aspnetcore/pull/42571 +(aefef28a51afd41d358eb0573e10cd858dcdc3e3) because source-build is still using an older +toolset. This will be addressed by @crummel in https://github.com/dotnet/installer/pull/14089. +--- + src/Servers/Kestrel/Core/src/Internal/Http/HttpParser.cs | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + +diff --git a/src/Servers/Kestrel/Core/src/Internal/Http/HttpParser.cs b/src/Servers/Kestrel/Core/src/Internal/Http/HttpParser.cs +index 63fc8668d6..5e18ba0861 100644 +--- a/src/Servers/Kestrel/Core/src/Internal/Http/HttpParser.cs ++++ b/src/Servers/Kestrel/Core/src/Internal/Http/HttpParser.cs +@@ -313,7 +313,7 @@ public class HttpParser : IHttpParser where TR + } + + SequencePosition lineEnd; +- scoped ReadOnlySpan headerSpan; ++ ReadOnlySpan headerSpan; + if (currentSlice.Slice(reader.Position, lineEndPosition.Value).Length == currentSlice.Length - 1) + { + // No enough data, so CRLF can't currently be there. +@@ -321,8 +321,7 @@ public class HttpParser : IHttpParser where TR + + // Advance 1 to include CR/LF in lineEnd + lineEnd = currentSlice.GetPosition(1, lineEndPosition.Value); +- var header = currentSlice.Slice(reader.Position, lineEnd); +- headerSpan = header.IsSingleSegment ? header.FirstSpan : header.ToArray(); ++ headerSpan = currentSlice.Slice(reader.Position, lineEnd).ToSpan(); + if (headerSpan[^1] != ByteCR) + { + RejectRequestHeader(headerSpan); diff --git a/src/SourceBuild/tarball/patches/aspnetcore/0004-Apply-lifetime-scoped-to-API.patch b/src/SourceBuild/tarball/patches/aspnetcore/0004-Apply-lifetime-scoped-to-API.patch new file mode 100644 index 000000000000..e66986a24293 --- /dev/null +++ b/src/SourceBuild/tarball/patches/aspnetcore/0004-Apply-lifetime-scoped-to-API.patch @@ -0,0 +1,22 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Aaron Robinson +Date: Wed, 29 Jun 2022 17:15:09 -0700 +Subject: [PATCH] Apply lifetime scoped to API. + +--- + src/Shared/ServerInfrastructure/BufferExtensions.cs | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/Shared/ServerInfrastructure/BufferExtensions.cs b/src/Shared/ServerInfrastructure/BufferExtensions.cs +index d68ccc1145..305ddbdd8f 100644 +--- a/src/Shared/ServerInfrastructure/BufferExtensions.cs ++++ b/src/Shared/ServerInfrastructure/BufferExtensions.cs +@@ -19,7 +19,7 @@ internal static class BufferExtensions + private static byte[]? _numericBytesScratch; + + [MethodImpl(MethodImplOptions.AggressiveInlining)] +- public static ReadOnlySpan ToSpan(in this ReadOnlySequence buffer) ++ public static ReadOnlySpan ToSpan(scoped in this ReadOnlySequence buffer) + { + if (buffer.IsSingleSegment) + { diff --git a/src/SourceBuild/tarball/patches/fsharp/0001-Upgrade-Microsoft.Win32.Registry-reference-to-5.0.0.patch b/src/SourceBuild/tarball/patches/fsharp/0001-Upgrade-Microsoft.Win32.Registry-reference-to-5.0.0.patch deleted file mode 100644 index f13e9de9f83a..000000000000 --- a/src/SourceBuild/tarball/patches/fsharp/0001-Upgrade-Microsoft.Win32.Registry-reference-to-5.0.0.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: MichaelSimons -Date: Tue, 3 May 2022 18:50:25 +0000 -Subject: [PATCH] Upgrade Microsoft.Win32.Registry reference to 5.0.0 - -Backport: https://github.com/dotnet/fsharp/pull/13091 ---- - eng/Versions.props | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/eng/Versions.props b/eng/Versions.props -index afefd9501..ff4d8ac89 100644 ---- a/eng/Versions.props -+++ b/eng/Versions.props -@@ -208,7 +208,7 @@ - 5.0.0-preview.7.20364.11 - 5.0.0-preview.7.20364.11 - 16.11.0 -- 4.3.0 -+ 5.0.0 - 13.0.1 - 3.13.2 - 4.1.0 diff --git a/src/SourceBuild/tarball/patches/fsharp/0002-fix-13174.patch b/src/SourceBuild/tarball/patches/fsharp/0002-fix-13174.patch deleted file mode 100644 index 71917a22ab61..000000000000 --- a/src/SourceBuild/tarball/patches/fsharp/0002-fix-13174.patch +++ /dev/null @@ -1,145 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Kevin Ransom -Date: Thu, 2 Jun 2022 17:09:16 -0700 -Subject: [PATCH] fix 13174 - -Backport: https://github.com/dotnet/fsharp/pull/13239 ---- - eng/Build.ps1 | 4 ++- - eng/SourceBuild.props | 2 +- - src/fsharp/FSharp.Build/FSharp.Build.fsproj | 3 +- - .../Microsoft.FSharp.Compiler.csproj | 32 ++++++++++++++++++- - src/fsharp/Microsoft.FSharp.Compiler/Program.cs | 2 +- - .../VisualFSharp.Core.targets | 2 +- - 6 files changed, 38 insertions(+), 7 deletions(-) - -diff --git a/eng/Build.ps1 b/eng/Build.ps1 -index 424cbe6c5..ce23ae7da 100644 ---- a/eng/Build.ps1 -+++ b/eng/Build.ps1 -@@ -61,6 +61,7 @@ param ( - [string]$officialSkipTests = "false", - [switch]$noVisualStudio, - [switch]$sourceBuild, -+ [switch]$skipBuild, - - [parameter(ValueFromRemainingArguments = $true)][string[]]$properties) - -@@ -114,6 +115,7 @@ function Print-Usage() { - Write-Host " -useGlobalNuGetCache Use global NuGet cache." - Write-Host " -noVisualStudio Only build fsc and fsi as .NET Core applications. No Visual Studio required. '-configuration', '-verbosity', '-norestore', '-rebuild' are supported." - Write-Host " -sourceBuild Simulate building for source-build." -+ Write-Host " -skipbuild Skip building product" - Write-Host "" - Write-Host "Command line arguments starting with '/p:' are passed through to MSBuild." - } -@@ -458,7 +460,7 @@ try { - } - - $script:BuildMessage = "Failure building product" -- if ($restore -or $build -or $rebuild -or $pack -or $sign -or $publish) { -+ if ($restore -or $build -or $rebuild -or $pack -or $sign -or $publish -and -not $skipBuild) { - if ($noVisualStudio) { - BuildSolution "FSharp.sln" - } -diff --git a/eng/SourceBuild.props b/eng/SourceBuild.props -index 903ee00d3..86c24c1b4 100644 ---- a/eng/SourceBuild.props -+++ b/eng/SourceBuild.props -@@ -26,7 +26,7 @@ - --> - - -- $(InnerBuildArgs) /p:Projects="$(InnerSourceBuildRepoRoot)\FSharp.sln" -+ $(InnerBuildArgs) /p:Projects="$(InnerSourceBuildRepoRoot)\Microsoft.FSharp.Compiler.sln" - - - -diff --git a/src/fsharp/FSharp.Build/FSharp.Build.fsproj b/src/fsharp/FSharp.Build/FSharp.Build.fsproj -index f293b92a0..b87e2def5 100644 ---- a/src/fsharp/FSharp.Build/FSharp.Build.fsproj -+++ b/src/fsharp/FSharp.Build/FSharp.Build.fsproj -@@ -4,8 +4,7 @@ - - - Library -- netstandard2.0 -- netstandard2.0 -+ netstandard2.0 - FSharp.Build - $(NoWarn);75 - true -diff --git a/src/fsharp/Microsoft.FSharp.Compiler/Microsoft.FSharp.Compiler.csproj b/src/fsharp/Microsoft.FSharp.Compiler/Microsoft.FSharp.Compiler.csproj -index eaeac80f3..e078498d7 100644 ---- a/src/fsharp/Microsoft.FSharp.Compiler/Microsoft.FSharp.Compiler.csproj -+++ b/src/fsharp/Microsoft.FSharp.Compiler/Microsoft.FSharp.Compiler.csproj -@@ -9,8 +9,12 @@ - .NET Core compatible version of the F# compiler fsc.exe. - /blob/main/release-notes.md#FSharp-Tools-$(FSProductVersionReleaseNotesVersion) - true -+ $(NuGetPackageRoot)microsoft.dotnet.arcade.sdk\$(ArcadeSdkVersion)\ -+ <_BuildReleasePackagesTargets>$(ArcadeSdkDir)tools\BuildReleasePackages.targets - - -+ -+ - - - -@@ -19,6 +23,33 @@ - - - -- -+ -+ -+ TargetFrameworks=netstandard2.1;netstandard2.0 -+ -+ -+ TargetFrameworks=netstandard2.0 -+ -+ -+ TargetFrameworks=netstandard2.0 -+ -+ -+ TargetFrameworks=netstandard2.0 -+ -+ -+ TargetFrameworks=netstandard2.0 -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ - - -diff --git a/src/fsharp/Microsoft.FSharp.Compiler/Program.cs b/src/fsharp/Microsoft.FSharp.Compiler/Program.cs -index c52f10378..0be8ed50b 100644 ---- a/src/fsharp/Microsoft.FSharp.Compiler/Program.cs -+++ b/src/fsharp/Microsoft.FSharp.Compiler/Program.cs -@@ -1,2 +1,2 @@ --// See https://aka.ms/new-console-template for more information -+// See https://aka.ms/new-console-template for more information - return 0; -\ No newline at end of file -diff --git a/vsintegration/Vsix/VisualFSharpFull/VisualFSharp.Core.targets b/vsintegration/Vsix/VisualFSharpFull/VisualFSharp.Core.targets -index 966cffad5..9b932e87e 100644 ---- a/vsintegration/Vsix/VisualFSharpFull/VisualFSharp.Core.targets -+++ b/vsintegration/Vsix/VisualFSharpFull/VisualFSharp.Core.targets -@@ -33,7 +33,7 @@ - All - 2 - True -- TargetFramework=$(DependencyTargetFramework) -+ TargetFramework=netstandard2.0 - - - diff --git a/src/SourceBuild/tarball/patches/roslyn-analyzers/0001-Eliminate-pre-built-assets-during-source-build-for-r.patch b/src/SourceBuild/tarball/patches/roslyn-analyzers/0001-Eliminate-pre-built-assets-during-source-build-for-r.patch index f2b0598525b7..feaf36b71f19 100644 --- a/src/SourceBuild/tarball/patches/roslyn-analyzers/0001-Eliminate-pre-built-assets-during-source-build-for-r.patch +++ b/src/SourceBuild/tarball/patches/roslyn-analyzers/0001-Eliminate-pre-built-assets-during-source-build-for-r.patch @@ -222,6 +222,6 @@ index fe90e93ca..01b64e055 100644 net6.0 true + true - + diff --git a/src/SourceBuild/tarball/patches/runtime/0003-Fully-qualify-conflicting-runtime-and-roslyn-APIs.patch b/src/SourceBuild/tarball/patches/runtime/0003-Fully-qualify-conflicting-runtime-and-roslyn-APIs.patch new file mode 100644 index 000000000000..ded89163a85e --- /dev/null +++ b/src/SourceBuild/tarball/patches/runtime/0003-Fully-qualify-conflicting-runtime-and-roslyn-APIs.patch @@ -0,0 +1,44 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Logan Bussell +Date: Thu, 14 Jul 2022 14:53:35 -0700 +Subject: [PATCH] Fully qualify conflicting runtime and roslyn APIs + +Runtime duplicated some Roslyn functionality because they build with an older version of Roslyn. +The methods are present in the source-build version of Roslyn, though, so we need to fully +qualify the references to GeneratorAttributeSyntaxContext to pick up the version that Runtime +expects to have. Using the Roslyn version here causes more problems so it is simpler to use +the version that Runtime expects and has tested against. + +See https://github.com/dotnet/runtime/pull/70911 + +--- + .../System.Private.CoreLib/gen/EventSourceGenerator.Parser.cs | 2 +- + .../System.Text.RegularExpressions/gen/RegexGenerator.Parser.cs | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/libraries/System.Private.CoreLib/gen/EventSourceGenerator.Parser.cs b/src/libraries/System.Private.CoreLib/gen/EventSourceGenerator.Parser.cs +index 43a498b589a..1bad8f3753c 100644 +--- a/src/libraries/System.Private.CoreLib/gen/EventSourceGenerator.Parser.cs ++++ b/src/libraries/System.Private.CoreLib/gen/EventSourceGenerator.Parser.cs +@@ -15,7 +15,7 @@ namespace Generators + { + public partial class EventSourceGenerator + { +- private static EventSourceClass? GetSemanticTargetForGeneration(GeneratorAttributeSyntaxContext context, CancellationToken cancellationToken) ++ private static EventSourceClass? GetSemanticTargetForGeneration(Microsoft.CodeAnalysis.DotnetRuntime.Extensions.GeneratorAttributeSyntaxContext context, CancellationToken cancellationToken) + { + const string EventSourceAttribute = "System.Diagnostics.Tracing.EventSourceAttribute"; + +diff --git a/src/libraries/System.Text.RegularExpressions/gen/RegexGenerator.Parser.cs b/src/libraries/System.Text.RegularExpressions/gen/RegexGenerator.Parser.cs +index 33dd18fc67f..13005b9d0a9 100644 +--- a/src/libraries/System.Text.RegularExpressions/gen/RegexGenerator.Parser.cs ++++ b/src/libraries/System.Text.RegularExpressions/gen/RegexGenerator.Parser.cs +@@ -20,7 +20,7 @@ public partial class RegexGenerator + + // Returns null if nothing to do, Diagnostic if there's an error to report, or RegexType if the type was analyzed successfully. + private static object? GetSemanticTargetForGeneration( +- GeneratorAttributeSyntaxContext context, CancellationToken cancellationToken) ++ Microsoft.CodeAnalysis.DotnetRuntime.Extensions.GeneratorAttributeSyntaxContext context, CancellationToken cancellationToken) + { + var methodSyntax = (MethodDeclarationSyntax)context.TargetNode; + SemanticModel sm = context.SemanticModel; From 1f42caf0cb8eb778a22578049684d64f05a58f9c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 18 Jul 2022 13:57:15 -0700 Subject: [PATCH 02/11] Update dependencies from https://github.com/dotnet/sdk build 20220718.9 (#14161) Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 7.0.100-preview.7.22368.2 -> To Version 7.0.100-preview.7.22368.9 Dependency coherency updates Microsoft.Net.Compilers.Toolset From Version 4.4.0-1.22367.2 -> To Version 4.4.0-1.22368.2 (parent: Microsoft.NET.Sdk Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 93b8a9a6cc25..c568e28abd27 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -107,14 +107,14 @@ 79a52dd4ffef8f7b6ea6afa4f897e35208408e8b - + https://github.com/dotnet/sdk - c93c7fadd3e80fa1f84c6bbed2b0c39c9ca868a3 + d32faa2498d3ccd7e90a920953f1086cbe615fc2 - + https://github.com/dotnet/sdk - c93c7fadd3e80fa1f84c6bbed2b0c39c9ca868a3 + d32faa2498d3ccd7e90a920953f1086cbe615fc2 @@ -145,9 +145,9 @@ linker - + https://github.com/dotnet/roslyn - 8659bb6911c30a26c813761851ba3c76805c851d + 8de559906bb859818a601243c6213e73c04fd4ac diff --git a/eng/Versions.props b/eng/Versions.props index a63757638fb9..5de93872b2a5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -65,8 +65,8 @@ - 7.0.100-preview.7.22368.2 - 7.0.100-preview.7.22368.2 + 7.0.100-preview.7.22368.9 + 7.0.100-preview.7.22368.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 7fb8238c2415a6b47e95045b1a2268a73977aeee Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 18 Jul 2022 16:58:57 -0700 Subject: [PATCH 03/11] Update dependencies from https://github.com/dotnet/sdk build 20220718.22 (#14166) Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 7.0.100-preview.7.22368.9 -> To Version 7.0.100-preview.7.22368.22 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.0-preview.7.22364.4 -> To Version 7.0.0-preview.7.22368.2 (parent: Microsoft.NET.Sdk Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 16 ++++++++-------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c568e28abd27..6d4a2f9debab 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,21 +1,21 @@ - + https://github.com/dotnet/windowsdesktop - 3933a4f6ac2d00bf27849014582abe46d4165e54 + 480150ede0b7bdcfb47fa2429d269c507d3b505a - + https://github.com/dotnet/windowsdesktop - 3933a4f6ac2d00bf27849014582abe46d4165e54 + 480150ede0b7bdcfb47fa2429d269c507d3b505a - + https://github.com/dotnet/windowsdesktop - 3933a4f6ac2d00bf27849014582abe46d4165e54 + 480150ede0b7bdcfb47fa2429d269c507d3b505a - + https://github.com/dotnet/windowsdesktop - 3933a4f6ac2d00bf27849014582abe46d4165e54 + 480150ede0b7bdcfb47fa2429d269c507d3b505a https://github.com/dotnet/runtime @@ -107,23 +107,23 @@ 79a52dd4ffef8f7b6ea6afa4f897e35208408e8b - + https://github.com/dotnet/sdk - d32faa2498d3ccd7e90a920953f1086cbe615fc2 + 358df8b053bb16cf28a8b11cd12650c6161192eb - + https://github.com/dotnet/sdk - d32faa2498d3ccd7e90a920953f1086cbe615fc2 + 358df8b053bb16cf28a8b11cd12650c6161192eb - + https://github.com/dotnet/winforms - 83c5b94ebf60fee35418be2f4d00fbe95af17ee5 + 175730145e1f57059d002a320a6ee19a5080afea - + https://github.com/dotnet/wpf - 498ca907dd3dd96ef5002c151665a20de6aac343 + 356e6815bcc211299a64de1b13962613c401589e https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 5de93872b2a5..c5a0413395e7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -30,11 +30,11 @@ - 7.0.0-preview.7.22364.2 + 7.0.0-preview.7.22365.1 - 7.0.0-preview.7.22364.2 + 7.0.0-preview.7.22368.5 @@ -65,8 +65,8 @@ - 7.0.100-preview.7.22368.9 - 7.0.100-preview.7.22368.9 + 7.0.100-preview.7.22368.22 + 7.0.100-preview.7.22368.22 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -87,10 +87,10 @@ - 7.0.0-preview.7.22364.4 - 7.0.0-preview.7.22364.4 - 7.0.0-preview.7.22364.4 - 7.0.0-preview.7.22364.4 + 7.0.0-preview.7.22368.2 + 7.0.0-preview.7.22368.2 + 7.0.0-preview.7.22368.2 + 7.0.0-preview.7.22368.2 From 761ce53b429ceea002b87616dfa24b411747fe18 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 19 Jul 2022 00:00:03 +0000 Subject: [PATCH 04/11] Update dependencies from https://github.com/dotnet/sdk build 20220718.24 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 7.0.100-preview.7.22368.22 -> To Version 7.0.100-preview.7.22368.24 Dependency coherency updates Microsoft.Build From Version 17.4.0-preview-22367-03 -> To Version 17.4.0-preview-22368-01 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6d4a2f9debab..4b077f41d154 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -107,14 +107,14 @@ 79a52dd4ffef8f7b6ea6afa4f897e35208408e8b - + https://github.com/dotnet/sdk - 358df8b053bb16cf28a8b11cd12650c6161192eb + 247c17e66f56ccf05f2070aa194387a4660de852 - + https://github.com/dotnet/sdk - 358df8b053bb16cf28a8b11cd12650c6161192eb + 247c17e66f56ccf05f2070aa194387a4660de852 @@ -150,9 +150,9 @@ 8de559906bb859818a601243c6213e73c04fd4ac - + https://github.com/dotnet/msbuild - 659a296a34870ea26a1ffa02919d886fd6445e2e + a1d9d6928dbc16ab59bdcefdf13e5770077a07da diff --git a/eng/Versions.props b/eng/Versions.props index c5a0413395e7..39575149d67a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -65,8 +65,8 @@ - 7.0.100-preview.7.22368.22 - 7.0.100-preview.7.22368.22 + 7.0.100-preview.7.22368.24 + 7.0.100-preview.7.22368.24 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From c54e2ff9dd2c2327814f3842af8dbd232ec8f1ca Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 19 Jul 2022 06:47:44 +0000 Subject: [PATCH 05/11] Update dependencies from https://github.com/dotnet/sdk build 20220718.26 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 7.0.100-preview.7.22368.24 -> To Version 7.0.100-preview.7.22368.26 Dependency coherency updates Microsoft.Net.Compilers.Toolset,Microsoft.Build From Version 4.4.0-1.22368.2 -> To Version 4.4.0-1.22368.4 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4b077f41d154..c0888ed97b3f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -107,14 +107,14 @@ 79a52dd4ffef8f7b6ea6afa4f897e35208408e8b - + https://github.com/dotnet/sdk - 247c17e66f56ccf05f2070aa194387a4660de852 + a47b3d0a36929916af589cfaffadaf7081f06eb2 - + https://github.com/dotnet/sdk - 247c17e66f56ccf05f2070aa194387a4660de852 + a47b3d0a36929916af589cfaffadaf7081f06eb2 @@ -145,14 +145,14 @@ linker - + https://github.com/dotnet/roslyn - 8de559906bb859818a601243c6213e73c04fd4ac + a9520913ab0047c0f9c039d42129725fbe09a640 - + https://github.com/dotnet/msbuild - a1d9d6928dbc16ab59bdcefdf13e5770077a07da + c8492483ad668b0bb8467d27ae34259f201594b6 diff --git a/eng/Versions.props b/eng/Versions.props index 39575149d67a..e38b1355ab21 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -65,8 +65,8 @@ - 7.0.100-preview.7.22368.24 - 7.0.100-preview.7.22368.24 + 7.0.100-preview.7.22368.26 + 7.0.100-preview.7.22368.26 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 69129f9d693be26751a549ff37e6e0ec0f913df9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 19 Jul 2022 07:31:34 -0700 Subject: [PATCH 06/11] Update dependencies from https://github.com/dotnet/sdk build 20220719.2 (#14171) Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 7.0.100-preview.7.22368.26 -> To Version 7.0.100-preview.7.22369.2 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.0-preview.7.22365.8 -> To Version 7.0.0-preview.7.22368.5 (parent: Microsoft.NET.Sdk Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 36 ++++++++++++++++++------------------ eng/Versions.props | 18 +++++++++--------- 2 files changed, 27 insertions(+), 27 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c0888ed97b3f..c787da9bd48c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -52,34 +52,34 @@ https://github.com/dotnet/runtime 3b0a07539792515b4fc4dc8b1b41c47ea594a0bb - + https://github.com/dotnet/aspnetcore - 44e64ad723c16e7fe39179f6ac3ba67c2396dd13 + c83c38499baacb5a641b3f27e04ebc9c125b78c7 - + https://github.com/dotnet/aspnetcore - 44e64ad723c16e7fe39179f6ac3ba67c2396dd13 + c83c38499baacb5a641b3f27e04ebc9c125b78c7 - + https://github.com/dotnet/aspnetcore - 44e64ad723c16e7fe39179f6ac3ba67c2396dd13 + c83c38499baacb5a641b3f27e04ebc9c125b78c7 - + https://github.com/dotnet/aspnetcore - 44e64ad723c16e7fe39179f6ac3ba67c2396dd13 + c83c38499baacb5a641b3f27e04ebc9c125b78c7 - + https://github.com/dotnet/aspnetcore - 44e64ad723c16e7fe39179f6ac3ba67c2396dd13 + c83c38499baacb5a641b3f27e04ebc9c125b78c7 - + https://github.com/dotnet/aspnetcore - 44e64ad723c16e7fe39179f6ac3ba67c2396dd13 + c83c38499baacb5a641b3f27e04ebc9c125b78c7 - + https://github.com/dotnet/aspnetcore - 44e64ad723c16e7fe39179f6ac3ba67c2396dd13 + c83c38499baacb5a641b3f27e04ebc9c125b78c7 https://github.com/dotnet/test-templates @@ -107,14 +107,14 @@ 79a52dd4ffef8f7b6ea6afa4f897e35208408e8b - + https://github.com/dotnet/sdk - a47b3d0a36929916af589cfaffadaf7081f06eb2 + c2033fdb837c1060ac66ac1af98c56ad4831eae6 - + https://github.com/dotnet/sdk - a47b3d0a36929916af589cfaffadaf7081f06eb2 + c2033fdb837c1060ac66ac1af98c56ad4831eae6 diff --git a/eng/Versions.props b/eng/Versions.props index e38b1355ab21..5b4b613d28d9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -52,21 +52,21 @@ - 7.0.0-preview.7.22365.8 - 7.0.0-preview.7.22365.8 - 7.0.0-preview.7.22365.8 - 7.0.0-preview.7.22365.8 - 7.0.0-preview.7.22365.8 - 7.0.0-preview.7.22365.8 - 7.0.0-preview.7.22365.8 + 7.0.0-preview.7.22368.5 + 7.0.0-preview.7.22368.5 + 7.0.0-preview.7.22368.5 + 7.0.0-preview.7.22368.5 + 7.0.0-preview.7.22368.5 + 7.0.0-preview.7.22368.5 + 7.0.0-preview.7.22368.5 0.2.0 - 7.0.100-preview.7.22368.26 - 7.0.100-preview.7.22368.26 + 7.0.100-preview.7.22369.2 + 7.0.100-preview.7.22369.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From a2d2f0291d6884e4f2a6d91441e24d9230b74244 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 19 Jul 2022 23:24:32 +0000 Subject: [PATCH 07/11] Update dependencies from https://github.com/dotnet/sdk build 20220719.11 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 7.0.100-preview.7.22369.2 -> To Version 7.0.100-preview.7.22369.11 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.0-preview.7.22368.5 -> To Version 7.0.0-preview.7.22369.2 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 36 ++++++++++++++++++------------------ eng/Versions.props | 18 +++++++++--------- 2 files changed, 27 insertions(+), 27 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c787da9bd48c..2369732300bd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -52,34 +52,34 @@ https://github.com/dotnet/runtime 3b0a07539792515b4fc4dc8b1b41c47ea594a0bb - + https://github.com/dotnet/aspnetcore - c83c38499baacb5a641b3f27e04ebc9c125b78c7 + 8869a47349b5426417c9dd1b4b6da91afe2857c7 - + https://github.com/dotnet/aspnetcore - c83c38499baacb5a641b3f27e04ebc9c125b78c7 + 8869a47349b5426417c9dd1b4b6da91afe2857c7 - + https://github.com/dotnet/aspnetcore - c83c38499baacb5a641b3f27e04ebc9c125b78c7 + 8869a47349b5426417c9dd1b4b6da91afe2857c7 - + https://github.com/dotnet/aspnetcore - c83c38499baacb5a641b3f27e04ebc9c125b78c7 + 8869a47349b5426417c9dd1b4b6da91afe2857c7 - + https://github.com/dotnet/aspnetcore - c83c38499baacb5a641b3f27e04ebc9c125b78c7 + 8869a47349b5426417c9dd1b4b6da91afe2857c7 - + https://github.com/dotnet/aspnetcore - c83c38499baacb5a641b3f27e04ebc9c125b78c7 + 8869a47349b5426417c9dd1b4b6da91afe2857c7 - + https://github.com/dotnet/aspnetcore - c83c38499baacb5a641b3f27e04ebc9c125b78c7 + 8869a47349b5426417c9dd1b4b6da91afe2857c7 https://github.com/dotnet/test-templates @@ -107,14 +107,14 @@ 79a52dd4ffef8f7b6ea6afa4f897e35208408e8b - + https://github.com/dotnet/sdk - c2033fdb837c1060ac66ac1af98c56ad4831eae6 + ee0d778e547889365dfce4ee7c0681307e0f7503 - + https://github.com/dotnet/sdk - c2033fdb837c1060ac66ac1af98c56ad4831eae6 + ee0d778e547889365dfce4ee7c0681307e0f7503 diff --git a/eng/Versions.props b/eng/Versions.props index 5b4b613d28d9..50e13316de16 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -52,21 +52,21 @@ - 7.0.0-preview.7.22368.5 - 7.0.0-preview.7.22368.5 - 7.0.0-preview.7.22368.5 - 7.0.0-preview.7.22368.5 - 7.0.0-preview.7.22368.5 - 7.0.0-preview.7.22368.5 - 7.0.0-preview.7.22368.5 + 7.0.0-preview.7.22369.2 + 7.0.0-preview.7.22369.2 + 7.0.0-preview.7.22369.2 + 7.0.0-preview.7.22369.2 + 7.0.0-preview.7.22369.2 + 7.0.0-preview.7.22369.2 + 7.0.0-preview.7.22369.2 0.2.0 - 7.0.100-preview.7.22369.2 - 7.0.100-preview.7.22369.2 + 7.0.100-preview.7.22369.11 + 7.0.100-preview.7.22369.11 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 56b380380891a501fb27f0f471fe33ceb6c2df4c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 20 Jul 2022 00:46:10 +0000 Subject: [PATCH 08/11] Update dependencies from https://github.com/dotnet/sdk build 20220719.13 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 7.0.100-preview.7.22369.2 -> To Version 7.0.100-preview.7.22369.13 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,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,VS.Redist.Common.NetCore.SharedFramework.x64.7.0 From Version 7.0.0-preview.7.22364.6 -> To Version 7.0.0-preview.7.22369.4 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 36 ++++++++++++++++++------------------ eng/Versions.props | 18 +++++++++--------- 2 files changed, 27 insertions(+), 27 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2369732300bd..5deeeeb6a99f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://github.com/dotnet/windowsdesktop 480150ede0b7bdcfb47fa2429d269c507d3b505a - + https://github.com/dotnet/runtime - 3b0a07539792515b4fc4dc8b1b41c47ea594a0bb + db5d4dfd16d2b56fd557b44d7b9e172372b43454 - + https://github.com/dotnet/runtime - 3b0a07539792515b4fc4dc8b1b41c47ea594a0bb + db5d4dfd16d2b56fd557b44d7b9e172372b43454 - + https://github.com/dotnet/runtime - 3b0a07539792515b4fc4dc8b1b41c47ea594a0bb + db5d4dfd16d2b56fd557b44d7b9e172372b43454 - + https://github.com/dotnet/runtime - 3b0a07539792515b4fc4dc8b1b41c47ea594a0bb + db5d4dfd16d2b56fd557b44d7b9e172372b43454 - + https://github.com/dotnet/runtime - 3b0a07539792515b4fc4dc8b1b41c47ea594a0bb + db5d4dfd16d2b56fd557b44d7b9e172372b43454 - + https://github.com/dotnet/runtime - 3b0a07539792515b4fc4dc8b1b41c47ea594a0bb + db5d4dfd16d2b56fd557b44d7b9e172372b43454 @@ -48,9 +48,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 3b0a07539792515b4fc4dc8b1b41c47ea594a0bb + db5d4dfd16d2b56fd557b44d7b9e172372b43454 https://github.com/dotnet/aspnetcore @@ -107,14 +107,14 @@ 79a52dd4ffef8f7b6ea6afa4f897e35208408e8b - + https://github.com/dotnet/sdk - ee0d778e547889365dfce4ee7c0681307e0f7503 + b7e880a88240f04ea005968b6fdb1cf3a5de0958 - + https://github.com/dotnet/sdk - ee0d778e547889365dfce4ee7c0681307e0f7503 + b7e880a88240f04ea005968b6fdb1cf3a5de0958 diff --git a/eng/Versions.props b/eng/Versions.props index 50e13316de16..3de5a0ed8b0f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -65,24 +65,24 @@ - 7.0.100-preview.7.22369.11 - 7.0.100-preview.7.22369.11 + 7.0.100-preview.7.22369.13 + 7.0.100-preview.7.22369.13 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 7.0.0-preview.7.22364.6 + 7.0.0-preview.7.22369.4 - 7.0.0-preview.7.22364.6 - 7.0.0-preview.7.22364.6 - 7.0.0-preview.7.22364.6 - 7.0.0-preview.7.22364.6 - 7.0.0-preview.7.22364.6 - 7.0.0-preview.7.22364.6 + 7.0.0-preview.7.22369.4 + 7.0.0-preview.7.22369.4 + 7.0.0-preview.7.22369.4 + 7.0.0-preview.7.22369.4 + 7.0.0-preview.7.22369.4 + 7.0.0-preview.7.22369.4 2.1.0 From f37485797775ecfa1cdea21df90d2c69e4d4dd0c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 20 Jul 2022 03:21:26 +0000 Subject: [PATCH 09/11] Update dependencies from https://github.com/dotnet/sdk build 20220719.15 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 7.0.100-preview.7.22369.13 -> To Version 7.0.100-preview.7.22369.15 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset From Version 12.0.4-beta.22363.4 -> To Version 12.0.4-beta.22369.1 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 4 ++-- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5deeeeb6a99f..9c2280a3df9e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -107,14 +107,14 @@ 79a52dd4ffef8f7b6ea6afa4f897e35208408e8b - + https://github.com/dotnet/sdk - b7e880a88240f04ea005968b6fdb1cf3a5de0958 + 1ba74fcbe5b75555e8729c9a378b644d1111b8d3 - + https://github.com/dotnet/sdk - b7e880a88240f04ea005968b6fdb1cf3a5de0958 + 1ba74fcbe5b75555e8729c9a378b644d1111b8d3 @@ -125,13 +125,13 @@ https://github.com/dotnet/wpf 356e6815bcc211299a64de1b13962613c401589e - + https://github.com/dotnet/fsharp - 1b94f89d4d1f41f20f9be73c76f4b229d4e49078 + 91ee836a7850f7629825e3d6e13f49cb809c0123 - + https://github.com/dotnet/fsharp - 1b94f89d4d1f41f20f9be73c76f4b229d4e49078 + 91ee836a7850f7629825e3d6e13f49cb809c0123 @@ -145,9 +145,9 @@ linker - + https://github.com/dotnet/roslyn - a9520913ab0047c0f9c039d42129725fbe09a640 + 7569242c5af0ad4f0b6d566559d39722851fcd7d diff --git a/eng/Versions.props b/eng/Versions.props index 3de5a0ed8b0f..5d534098a66b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -65,8 +65,8 @@ - 7.0.100-preview.7.22369.13 - 7.0.100-preview.7.22369.13 + 7.0.100-preview.7.22369.15 + 7.0.100-preview.7.22369.15 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From bc3e3083464b2880a935c519dafc9dcad3a57eb0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 20 Jul 2022 06:52:22 +0000 Subject: [PATCH 10/11] Update dependencies from https://github.com/dotnet/sdk build 20220719.17 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 7.0.100-preview.7.22369.13 -> To Version 7.0.100-preview.7.22369.17 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,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.Compilers.Toolset From Version 7.0.0-preview.7.22368.2 -> To Version 7.0.0-preview.7.22369.18 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 40 ++++++++++++++++++++-------------------- eng/Versions.props | 18 +++++++++--------- 2 files changed, 29 insertions(+), 29 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9c2280a3df9e..0bc64a950e8a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,21 +1,21 @@ - + https://github.com/dotnet/windowsdesktop - 480150ede0b7bdcfb47fa2429d269c507d3b505a + 505ab025f90aeb293625a32ac47ea59dad3f9c17 - + https://github.com/dotnet/windowsdesktop - 480150ede0b7bdcfb47fa2429d269c507d3b505a + 505ab025f90aeb293625a32ac47ea59dad3f9c17 - + https://github.com/dotnet/windowsdesktop - 480150ede0b7bdcfb47fa2429d269c507d3b505a + 505ab025f90aeb293625a32ac47ea59dad3f9c17 - + https://github.com/dotnet/windowsdesktop - 480150ede0b7bdcfb47fa2429d269c507d3b505a + 505ab025f90aeb293625a32ac47ea59dad3f9c17 https://github.com/dotnet/runtime @@ -98,32 +98,32 @@ 9c5549788cda5238a0e65466cbde9eb4ed42b695 - + https://github.com/dotnet/templating - 79a52dd4ffef8f7b6ea6afa4f897e35208408e8b + 4065aa33c051bfd06543992c7058e8fdb8ac0f1a - + https://github.com/dotnet/templating - 79a52dd4ffef8f7b6ea6afa4f897e35208408e8b + 4065aa33c051bfd06543992c7058e8fdb8ac0f1a - + https://github.com/dotnet/sdk - 1ba74fcbe5b75555e8729c9a378b644d1111b8d3 + ef297c043f40cc2b8f126de7307682b9a500672a - + https://github.com/dotnet/sdk - 1ba74fcbe5b75555e8729c9a378b644d1111b8d3 + ef297c043f40cc2b8f126de7307682b9a500672a - + https://github.com/dotnet/winforms - 175730145e1f57059d002a320a6ee19a5080afea + d2b2f809703f0dbcda70ff110c64c5de06da9680 - + https://github.com/dotnet/wpf - 356e6815bcc211299a64de1b13962613c401589e + 8c40233a57cf1151424df37b827eafcde8b9288c https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 5d534098a66b..8b1670ab420d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -30,15 +30,15 @@ - 7.0.0-preview.7.22365.1 + 7.0.0-preview.7.22369.6 - 7.0.0-preview.7.22368.5 + 7.0.0-preview.7.22369.6 - 7.0.100-preview.7.22365.2 + 7.0.100-preview.7.22369.4 @@ -65,8 +65,8 @@ - 7.0.100-preview.7.22369.15 - 7.0.100-preview.7.22369.15 + 7.0.100-preview.7.22369.17 + 7.0.100-preview.7.22369.17 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -87,10 +87,10 @@ - 7.0.0-preview.7.22368.2 - 7.0.0-preview.7.22368.2 - 7.0.0-preview.7.22368.2 - 7.0.0-preview.7.22368.2 + 7.0.0-preview.7.22369.18 + 7.0.0-preview.7.22369.18 + 7.0.0-preview.7.22369.18 + 7.0.0-preview.7.22369.18 From dbdda951424aa9b4d299d60f161f040af56d9886 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 20 Jul 2022 13:06:44 +0000 Subject: [PATCH 11/11] Update dependencies from https://github.com/dotnet/sdk build 20220720.2 (#14179) [release/7.0.1xx-preview7] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.AspNetCore.App.Ref: from 7.0.0-preview.7.22369.2 to 7.0.0-preview.7.22369.8 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 7.0.0-preview.7.22369.2 to 7.0.0-preview.7.22369.8 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 7.0.0-preview.7.22369.2 to 7.0.0-preview.7.22369.8 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0: from 7.0.0-preview.7.22369.2 to 7.0.0-preview.7.22369.8 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 7.0.0-preview.7.22369.2 to 7.0.0-preview.7.22369.8 (parent: Microsoft.NET.Sdk) - dotnet-user-jwts: from 7.0.0-preview.7.22369.2 to 7.0.0-preview.7.22369.8 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 7.0.0-preview.7.22369.2 to 7.0.0-preview.7.22369.8 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 36 ++++++++++++++++++------------------ eng/Versions.props | 18 +++++++++--------- 2 files changed, 27 insertions(+), 27 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0bc64a950e8a..d280e16ca0e3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -52,34 +52,34 @@ https://github.com/dotnet/runtime db5d4dfd16d2b56fd557b44d7b9e172372b43454 - + https://github.com/dotnet/aspnetcore - 8869a47349b5426417c9dd1b4b6da91afe2857c7 + 5cdbfc137861196cf6e02130ea50403c13c8a01b - + https://github.com/dotnet/aspnetcore - 8869a47349b5426417c9dd1b4b6da91afe2857c7 + 5cdbfc137861196cf6e02130ea50403c13c8a01b - + https://github.com/dotnet/aspnetcore - 8869a47349b5426417c9dd1b4b6da91afe2857c7 + 5cdbfc137861196cf6e02130ea50403c13c8a01b - + https://github.com/dotnet/aspnetcore - 8869a47349b5426417c9dd1b4b6da91afe2857c7 + 5cdbfc137861196cf6e02130ea50403c13c8a01b - + https://github.com/dotnet/aspnetcore - 8869a47349b5426417c9dd1b4b6da91afe2857c7 + 5cdbfc137861196cf6e02130ea50403c13c8a01b - + https://github.com/dotnet/aspnetcore - 8869a47349b5426417c9dd1b4b6da91afe2857c7 + 5cdbfc137861196cf6e02130ea50403c13c8a01b - + https://github.com/dotnet/aspnetcore - 8869a47349b5426417c9dd1b4b6da91afe2857c7 + 5cdbfc137861196cf6e02130ea50403c13c8a01b https://github.com/dotnet/test-templates @@ -107,14 +107,14 @@ 4065aa33c051bfd06543992c7058e8fdb8ac0f1a - + https://github.com/dotnet/sdk - ef297c043f40cc2b8f126de7307682b9a500672a + f7d1f3967f65f59fbb792c49a55a09975c6e6524 - + https://github.com/dotnet/sdk - ef297c043f40cc2b8f126de7307682b9a500672a + f7d1f3967f65f59fbb792c49a55a09975c6e6524 diff --git a/eng/Versions.props b/eng/Versions.props index 8b1670ab420d..ac60a05770a0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -52,21 +52,21 @@ - 7.0.0-preview.7.22369.2 - 7.0.0-preview.7.22369.2 - 7.0.0-preview.7.22369.2 - 7.0.0-preview.7.22369.2 - 7.0.0-preview.7.22369.2 - 7.0.0-preview.7.22369.2 - 7.0.0-preview.7.22369.2 + 7.0.0-preview.7.22369.8 + 7.0.0-preview.7.22369.8 + 7.0.0-preview.7.22369.8 + 7.0.0-preview.7.22369.8 + 7.0.0-preview.7.22369.8 + 7.0.0-preview.7.22369.8 + 7.0.0-preview.7.22369.8 0.2.0 - 7.0.100-preview.7.22369.17 - 7.0.100-preview.7.22369.17 + 7.0.100-preview.7.22370.2 + 7.0.100-preview.7.22370.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion)