From cd945bc991f3cf9f520d75d2b579ac8fbdd58d82 Mon Sep 17 00:00:00 2001 From: Sarah Oslund Date: Wed, 15 Sep 2021 15:45:00 -0700 Subject: [PATCH 001/140] Update branding for 6.0.1xx branch --- eng/Versions.props | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 1b7f35177..49a174e4b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -10,8 +10,7 @@ 1 00 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) - rc - 2 + rtm $(VersionMajor).$(VersionMinor) $(MajorMinorVersion).$(VersionSDKMinor) From 791eb4a234cb395d559a16c7729fee10374f2335 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 16 Sep 2021 07:29:35 -0700 Subject: [PATCH 002/140] [release/6.0.1xx] Update dependencies from dotnet/sdk (#11969) * Update dependencies from https://github.com/dotnet/sdk build 20210910.38 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.100-rc.2.21460.35 -> To Version 6.0.100-rc.2.21460.38 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.SourceBuild.Intermediate.source-build From Version 6.0.0-rc.2.21459.14 -> To Version 6.0.0-rc.2.21460.3 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20210910.42 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.100-rc.2.21460.35 -> To Version 6.0.100-rc.2.21460.42 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0,dotnet-dev-certs,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.SourceBuild.Intermediate.source-build From Version 6.0.0-rc.2.21459.14 -> To Version 6.0.0-rc.2.21460.3 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20210910.46 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.100-rc.2.21460.35 -> To Version 6.0.100-rc.2.21460.46 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0,dotnet-dev-certs,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.SourceBuild.Intermediate.source-build From Version 6.0.0-rc.2.21459.14 -> To Version 6.0.0-rc.2.21460.5 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20210910.48 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.100-rc.2.21460.35 -> To Version 6.0.100-rc.2.21460.48 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0,dotnet-dev-certs,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.SourceBuild.Intermediate.source-build From Version 6.0.0-rc.2.21459.14 -> To Version 6.0.0-rc.2.21460.5 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20210910.52 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.100-rc.2.21460.35 -> To Version 6.0.100-rc.2.21460.52 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0,dotnet-dev-certs,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.SourceBuild.Intermediate.source-build From Version 6.0.0-rc.2.21459.14 -> To Version 6.0.0-rc.2.21460.5 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20210910.55 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.100-rc.2.21460.35 -> To Version 6.0.100-rc.2.21460.55 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,Microsoft.NETCore.App.Ref,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.6.0,dotnet-dev-certs,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.6.0,Microsoft.SourceBuild.Intermediate.source-build From Version 6.0.0-rc.2.21459.14 -> To Version 6.0.0-rc.2.21460.5 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20210910.57 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.100-rc.2.21460.35 -> To Version 6.0.100-rc.2.21460.57 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,Microsoft.NETCore.App.Ref,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.6.0,dotnet-dev-certs,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.6.0,Microsoft.SourceBuild.Intermediate.source-build From Version 6.0.0-rc.2.21459.14 -> To Version 6.0.0-rc.2.21460.5 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20210910.60 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.100-rc.2.21460.35 -> To Version 6.0.100-rc.2.21460.60 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,Microsoft.NETCore.App.Ref,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.6.0,dotnet-dev-certs,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.6.0,Microsoft.SourceBuild.Intermediate.source-build From Version 6.0.0-rc.2.21459.14 -> To Version 6.0.0-rc.2.21460.8 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20210910.61 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.100-rc.2.21460.35 -> To Version 6.0.100-rc.2.21460.61 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,Microsoft.NETCore.App.Ref,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.6.0,dotnet-dev-certs,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.6.0,Microsoft.SourceBuild.Intermediate.source-build From Version 6.0.0-rc.2.21459.14 -> To Version 6.0.0-rc.2.21460.8 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20210910.65 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.100-rc.2.21460.35 -> To Version 6.0.100-rc.2.21460.65 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,Microsoft.NETCore.App.Ref,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.6.0,dotnet-dev-certs,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.6.0,Microsoft.SourceBuild.Intermediate.source-build From Version 6.0.0-rc.2.21459.14 -> To Version 6.0.0-rc.2.21460.8 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20210911.1 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.100-rc.2.21460.35 -> To Version 6.0.100-rc.2.21461.1 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,Microsoft.NETCore.App.Ref,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.6.0,dotnet-dev-certs,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.6.0,Microsoft.SourceBuild.Intermediate.source-build From Version 6.0.0-rc.2.21459.14 -> To Version 6.0.0-rc.2.21460.8 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20210911.4 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.100-rc.2.21460.35 -> To Version 6.0.100-rc.2.21461.4 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,Microsoft.NETCore.App.Ref,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.6.0,dotnet-dev-certs,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.6.0,Microsoft.SourceBuild.Intermediate.source-build From Version 6.0.0-rc.2.21459.14 -> To Version 6.0.0-rc.2.21460.8 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20210911.6 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.100-rc.2.21460.35 -> To Version 6.0.100-rc.2.21461.6 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,Microsoft.NETCore.App.Ref,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.6.0,dotnet-dev-certs,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.6.0,Microsoft.SourceBuild.Intermediate.source-build From Version 6.0.0-rc.2.21459.14 -> To Version 6.0.0-rc.2.21460.8 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20210911.8 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.100-rc.2.21460.35 -> To Version 6.0.100-rc.2.21461.8 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,Microsoft.NETCore.App.Ref,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.6.0,dotnet-dev-certs,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.6.0,Microsoft.SourceBuild.Intermediate.source-build From Version 6.0.0-rc.2.21459.14 -> To Version 6.0.0-rc.2.21460.8 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20210911.12 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.100-rc.2.21460.35 -> To Version 6.0.100-rc.2.21461.12 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,Microsoft.NETCore.App.Ref,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.6.0,dotnet-dev-certs,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.6.0,Microsoft.SourceBuild.Intermediate.source-build From Version 6.0.0-rc.2.21459.14 -> To Version 6.0.0-rc.2.21461.2 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20210911.14 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.100-rc.2.21460.35 -> To Version 6.0.100-rc.2.21461.14 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,Microsoft.NETCore.App.Ref,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.6.0,dotnet-dev-certs,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.6.0,Microsoft.SourceBuild.Intermediate.source-build From Version 6.0.0-rc.2.21459.14 -> To Version 6.0.0-rc.2.21461.2 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20210911.21 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.100-rc.2.21460.35 -> To Version 6.0.100-rc.2.21461.21 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,Microsoft.NETCore.App.Ref,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.6.0,dotnet-dev-certs,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.6.0,Microsoft.SourceBuild.Intermediate.source-build From Version 6.0.0-rc.2.21459.14 -> To Version 6.0.0-rc.2.21461.2 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20210911.22 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.100-rc.2.21460.35 -> To Version 6.0.100-rc.2.21461.22 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,Microsoft.NETCore.App.Ref,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.6.0,dotnet-dev-certs,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.6.0,Microsoft.SourceBuild.Intermediate.source-build From Version 6.0.0-rc.2.21459.14 -> To Version 6.0.0-rc.2.21461.2 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20210911.25 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.100-rc.2.21460.35 -> To Version 6.0.100-rc.2.21461.25 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,Microsoft.NETCore.App.Ref,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.6.0,dotnet-dev-certs,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.6.0,Microsoft.SourceBuild.Intermediate.source-build From Version 6.0.0-rc.2.21459.14 -> To Version 6.0.0-rc.2.21461.2 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20210912.4 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.100-rc.2.21460.35 -> To Version 6.0.100-rc.2.21462.4 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,Microsoft.NETCore.App.Ref,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.6.0,dotnet-dev-certs,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.6.0,Microsoft.SourceBuild.Intermediate.source-build From Version 6.0.0-rc.2.21459.14 -> To Version 6.0.0-rc.2.21461.2 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20210913.1 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.100-rc.2.21460.35 -> To Version 6.0.100-rc.2.21463.1 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,Microsoft.NETCore.App.Ref,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.6.0,dotnet-dev-certs,dotnet-user-secrets,Microsoft.DotNet.Common.ItemTemplates,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.6.0,Microsoft.SourceBuild.Intermediate.source-build From Version 6.0.0-rc.2.21459.14 -> To Version 6.0.0-rc.2.21461.2 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20210913.6 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.100-rc.2.21460.35 -> To Version 6.0.100-rc.2.21463.6 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,Microsoft.NETCore.App.Ref,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.6.0,dotnet-dev-certs,dotnet-user-secrets,Microsoft.DotNet.Common.ItemTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.Build,VS.Redist.Common.NetCore.SharedFramework.x64.6.0,Microsoft.SourceBuild.Intermediate.source-build From Version 6.0.0-rc.2.21459.14 -> To Version 6.0.0-rc.2.21461.2 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20210913.8 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.100-rc.2.21460.35 -> To Version 6.0.100-rc.2.21463.8 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,Microsoft.NETCore.App.Ref,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.6.0,dotnet-dev-certs,dotnet-user-secrets,Microsoft.DotNet.Common.ItemTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.Build,VS.Redist.Common.NetCore.SharedFramework.x64.6.0,Microsoft.SourceBuild.Intermediate.source-build From Version 6.0.0-rc.2.21459.14 -> To Version 6.0.0-rc.2.21461.2 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20210913.10 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.100-rc.2.21460.35 -> To Version 6.0.100-rc.2.21463.10 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,Microsoft.NETCore.App.Ref,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.6.0,dotnet-dev-certs,dotnet-user-secrets,Microsoft.DotNet.Common.ItemTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.Build,VS.Redist.Common.NetCore.SharedFramework.x64.6.0,Microsoft.SourceBuild.Intermediate.source-build From Version 6.0.0-rc.2.21459.14 -> To Version 6.0.0-rc.2.21461.2 (parent: Microsoft.NET.Sdk * Fix downgrade issue with source-build Manual fix since the core issue was fixed in the SDK repo. Co-authored-by: dotnet-maestro[bot] Co-authored-by: William Godbe Co-authored-by: Michael Simons --- eng/Version.Details.xml | 98 ++++++++++++++++++++--------------------- eng/Versions.props | 44 +++++++++--------- 2 files changed, 71 insertions(+), 71 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 36793d075..5b505cd04 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,45 +1,45 @@ - + https://github.com/dotnet/windowsdesktop - d98d7fba12f3adb7787dc0d7ae9d2c2b577b075c + 8da4caa78db8e0bfb18386d4c6ca943944551f04 - + https://github.com/dotnet/windowsdesktop - d98d7fba12f3adb7787dc0d7ae9d2c2b577b075c + 8da4caa78db8e0bfb18386d4c6ca943944551f04 - + https://github.com/dotnet/windowsdesktop - d98d7fba12f3adb7787dc0d7ae9d2c2b577b075c + 8da4caa78db8e0bfb18386d4c6ca943944551f04 - + https://github.com/dotnet/windowsdesktop - d98d7fba12f3adb7787dc0d7ae9d2c2b577b075c + 8da4caa78db8e0bfb18386d4c6ca943944551f04 - + https://github.com/dotnet/runtime - 8bfc0302a28bd94fe5078d9ea489b6a8bc8978ee + 71fe9fb8ecc11197ad8e7bee0a6c4317a667327c - + https://github.com/dotnet/runtime - 8bfc0302a28bd94fe5078d9ea489b6a8bc8978ee + 71fe9fb8ecc11197ad8e7bee0a6c4317a667327c - + https://github.com/dotnet/runtime - 8bfc0302a28bd94fe5078d9ea489b6a8bc8978ee + 71fe9fb8ecc11197ad8e7bee0a6c4317a667327c - + https://github.com/dotnet/runtime - 8bfc0302a28bd94fe5078d9ea489b6a8bc8978ee + 71fe9fb8ecc11197ad8e7bee0a6c4317a667327c - + https://github.com/dotnet/runtime - 8bfc0302a28bd94fe5078d9ea489b6a8bc8978ee + 71fe9fb8ecc11197ad8e7bee0a6c4317a667327c - + https://github.com/dotnet/runtime - 8bfc0302a28bd94fe5078d9ea489b6a8bc8978ee + 71fe9fb8ecc11197ad8e7bee0a6c4317a667327c @@ -47,34 +47,34 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 8bfc0302a28bd94fe5078d9ea489b6a8bc8978ee + 71fe9fb8ecc11197ad8e7bee0a6c4317a667327c - + https://github.com/dotnet/aspnetcore - 5433e858eb83a55a3bea110bf14e5eda1359db77 + baf21f6cf308b81e25cd5c13f7e0bc88ee2488cc - + https://github.com/dotnet/aspnetcore - 5433e858eb83a55a3bea110bf14e5eda1359db77 + baf21f6cf308b81e25cd5c13f7e0bc88ee2488cc - + https://github.com/dotnet/aspnetcore - 5433e858eb83a55a3bea110bf14e5eda1359db77 + baf21f6cf308b81e25cd5c13f7e0bc88ee2488cc - + https://github.com/dotnet/aspnetcore - 5433e858eb83a55a3bea110bf14e5eda1359db77 + baf21f6cf308b81e25cd5c13f7e0bc88ee2488cc - + https://github.com/dotnet/aspnetcore - 5433e858eb83a55a3bea110bf14e5eda1359db77 + baf21f6cf308b81e25cd5c13f7e0bc88ee2488cc - + https://github.com/dotnet/aspnetcore - 5433e858eb83a55a3bea110bf14e5eda1359db77 + baf21f6cf308b81e25cd5c13f7e0bc88ee2488cc https://github.com/dotnet/test-templates @@ -89,32 +89,32 @@ baf4b38e4f1dbc637efdb41624acbe05b2ff9f35 - + https://github.com/dotnet/templating - 79209eac8a27bcabf5a064a88abb95f32b91d863 + 7b1cdc82ac330e5dbb10776173299214619422ac - + https://github.com/dotnet/templating - 79209eac8a27bcabf5a064a88abb95f32b91d863 + 7b1cdc82ac330e5dbb10776173299214619422ac - + https://github.com/dotnet/sdk - 608c77bf1451ee87374541a1b4b04d3bfa9abd66 + 09168af0a7859da29506d2b73ea08d05513a64bb - + https://github.com/dotnet/sdk - 608c77bf1451ee87374541a1b4b04d3bfa9abd66 + 09168af0a7859da29506d2b73ea08d05513a64bb - + https://github.com/dotnet/winforms - 08b8359d86475f6c5caf2e13b66fb9706e225acf + fe2c8e79cc6bb67d9ef7c96c5b47364ddfbdc30f - + https://github.com/dotnet/wpf - 0336b71d5a9c2036e0edbbbe5831453e4d242701 + 61634fd9e064574c69a05cbab63e8df3c522f1bd https://github.com/dotnet/fsharp @@ -140,9 +140,9 @@ dae39045cd460ba44053ff2af2217da126c25dbf - + https://github.com/dotnet/msbuild - 8f208e60995dce87ecd5f0edd313b23ef1d67bb8 + e3e141ff09f1bae32db7ed00f33b17794e66a687 @@ -164,7 +164,7 @@ https://github.com/dotnet/source-build - ca07d8763334fa66011ed496d444d68355fb9511 + 3fb25b8db3bec654e37e71a5b2b7fde14444bc2f diff --git a/eng/Versions.props b/eng/Versions.props index 49a174e4b..6b3d2b933 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,15 +23,15 @@ - 6.0.0-rc.2.21459.12 + 6.0.0-rc.2.21461.3 - 6.0.0-rc.2.21459.13 + 6.0.0-rc.2.21461.2 - 6.0.100-rc.2.21459.6 + 6.0.100-rc.2.21463.2 @@ -44,44 +44,44 @@ - 6.0.0-rc.2.21460.4 - 6.0.0-rc.2.21460.4 - 6.0.0-rc.2.21460.4 - 6.0.0-rc.2.21460.4 - 6.0.0-rc.2.21460.4 - 6.0.0-rc.2.21460.4 + 6.0.0-rc.2.21462.1 + 6.0.0-rc.2.21462.1 + 6.0.0-rc.2.21462.1 + 6.0.0-rc.2.21462.1 + 6.0.0-rc.2.21462.1 + 6.0.0-rc.2.21462.1 0.2.0 - 6.0.100-rc.2.21460.35 - 6.0.100-rc.2.21460.35 + 6.0.100-rc.2.21463.10 + 6.0.100-rc.2.21463.10 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 6.0.0-rc.2.21460.8 + 6.0.0-rc.2.21461.1 - 6.0.0-rc.2.21460.8 - 6.0.0-rc.2.21460.8 - 6.0.0-rc.2.21460.8 - 6.0.0-rc.2.21460.8 - 6.0.0-rc.2.21460.8 - 6.0.0-rc.2.21460.8 + 6.0.0-rc.2.21461.1 + 6.0.0-rc.2.21461.1 + 6.0.0-rc.2.21461.1 + 6.0.0-rc.2.21461.1 + 6.0.0-rc.2.21461.1 + 6.0.0-rc.2.21461.1 2.1.0 - 6.0.0-rc.2.21459.14 - 6.0.0-rc.2.21459.14 - 6.0.0-rc.2.21459.14 - 6.0.0-rc.2.21459.14 + 6.0.0-rc.2.21461.2 + 6.0.0-rc.2.21461.2 + 6.0.0-rc.2.21461.2 + 6.0.0-rc.2.21461.2 From 448400e0a5a5a8a5008aecdae35172ddf468d4d9 Mon Sep 17 00:00:00 2001 From: Omair Majid Date: Thu, 16 Sep 2021 15:57:20 -0400 Subject: [PATCH 003/140] [ArPow] Run smoke tests for tarball CI (#11023) * [ArPow] Run smoke tests for tarball CI Fixes: dotnet/source-build#2298 * Update smoke-tests version reference * comment out tests with missing templates and temporarily accommodate missing xml files * Disable f# and blazorwasm tests Co-authored-by: Michael Simons Co-authored-by: Logan Bussell <36081148+lbussell@users.noreply.github.com> --- .../job/source-build-run-tarball-build.yml | 6 + .../tarball/content/Directory.Build.props | 1 - .../tarball/content/Directory.Build.targets | 7 - src/SourceBuild/tarball/content/build.proj | 10 +- src/SourceBuild/tarball/content/build.sh | 1 + src/SourceBuild/tarball/content/smoke-test.sh | 162 ++++++++++++++++-- 6 files changed, 156 insertions(+), 31 deletions(-) diff --git a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml index 6f3293ea6..7c97439bd 100644 --- a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml +++ b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml @@ -87,6 +87,12 @@ jobs: artifact: $(Agent.JobName)_Artifacts_Attempt$(System.JobAttempt) displayName: Publish Source Build Artifacts + - script: | + set -x + + docker run --rm -v $(_TarballDir):/tarball -w /tarball $(_Container) ./build.sh --run-smoke-test + displayName: Run Tests + - template: /src/SourceBuild/Arcade/eng/common/templates/steps/source-build-publish-logs.yml parameters: sourceFolder: $(_TarballDir) diff --git a/src/SourceBuild/tarball/content/Directory.Build.props b/src/SourceBuild/tarball/content/Directory.Build.props index d4f1aa392..f6a195464 100644 --- a/src/SourceBuild/tarball/content/Directory.Build.props +++ b/src/SourceBuild/tarball/content/Directory.Build.props @@ -81,7 +81,6 @@ $(ProjectDir)src/ $(ProjectDir).gitmodules - $(ProjectDir)ProdConFeed.txt diff --git a/src/SourceBuild/tarball/content/Directory.Build.targets b/src/SourceBuild/tarball/content/Directory.Build.targets index 15a75864c..02ff624bc 100644 --- a/src/SourceBuild/tarball/content/Directory.Build.targets +++ b/src/SourceBuild/tarball/content/Directory.Build.targets @@ -12,11 +12,4 @@ - - - $([System.IO.File]::ReadAllText('$(ProdConFeedPath)').Trim()) - $(ProdConBlobFeedUrl.Replace('https://dotnetfeed.blob.core.windows.net/', '$(ProdConBlobFeedUrlPrefix)')) - - - diff --git a/src/SourceBuild/tarball/content/build.proj b/src/SourceBuild/tarball/content/build.proj index 40d416adc..117a13675 100644 --- a/src/SourceBuild/tarball/content/build.proj +++ b/src/SourceBuild/tarball/content/build.proj @@ -90,7 +90,7 @@ - + ./smoke-test.sh $(SmokeTestCommand) --minimal @@ -102,15 +102,9 @@ $(SmokeTestCommand) --excludeWebHttpsTests - + targetRid=$(TargetRid)" /> diff --git a/src/SourceBuild/tarball/content/build.sh b/src/SourceBuild/tarball/content/build.sh index 21c366fe1..f33b95575 100755 --- a/src/SourceBuild/tarball/content/build.sh +++ b/src/SourceBuild/tarball/content/build.sh @@ -8,6 +8,7 @@ usage() { echo " --online build using online sources" echo " --with-packages use the specified directory of previously-built packages" echo " --with-sdk use the SDK in the specified directory for bootstrapping" + echo " --run-smoke-test don't build; run smoke tests" echo "use -- to send the remaining arguments to MSBuild" echo "" } diff --git a/src/SourceBuild/tarball/content/smoke-test.sh b/src/SourceBuild/tarball/content/smoke-test.sh index c97da1044..07a5f39ae 100755 --- a/src/SourceBuild/tarball/content/smoke-test.sh +++ b/src/SourceBuild/tarball/content/smoke-test.sh @@ -3,10 +3,10 @@ set -euo pipefail SCRIPT_ROOT="$(cd -P "$( dirname "$0" )" && pwd)" TARBALL_PREFIX=dotnet-sdk- -VERSION_PREFIX=5.0 +VERSION_PREFIX=6.0 # See https://github.com/dotnet/source-build/issues/579, this version # needs to be compatible with the runtime produced from source-build -DEV_CERTS_VERSION_DEFAULT=5.0.0-preview.3 +DEV_CERTS_VERSION_DEFAULT=6.0.0-preview.6.21355.2 __ROOT_REPO=$(sed 's/\r$//' "$SCRIPT_ROOT/artifacts/obj/rootrepo.txt") # remove CR if mounted repo on Windows drive executingUserHome=${HOME:-} @@ -155,7 +155,7 @@ while :; do shift done -prodConBlobFeedUrl="${prodConBlobFeedUrl-$(cat "$SCRIPT_ROOT/ProdConFeed.txt")}" +prodConBlobFeedUrl="${prodConBlobFeedUrl-}" function doCommand() { lang=$1 @@ -291,18 +291,18 @@ function runAllTests() { if [ "$excludeNonWebTests" == "false" ]; then doCommand C# console new restore build run multi-rid-publish doCommand C# classlib new restore build multi-rid-publish - doCommand C# xunit new restore test - doCommand C# mstest new restore test + # doCommand C# xunit new restore test + # doCommand C# mstest new restore test doCommand VB console new restore build run multi-rid-publish doCommand VB classlib new restore build multi-rid-publish - doCommand VB xunit new restore test - doCommand VB mstest new restore test + # doCommand VB xunit new restore test + # doCommand VB mstest new restore test - doCommand F# console new restore build run multi-rid-publish - doCommand F# classlib new restore build multi-rid-publish - doCommand F# xunit new restore test - doCommand F# mstest new restore test + # doCommand F# console new restore build run multi-rid-publish + # doCommand F# classlib new restore build multi-rid-publish + # doCommand F# xunit new restore test + # doCommand F# mstest new restore test fi if [ "$excludeWebTests" == "false" ]; then @@ -324,12 +324,12 @@ function runWebTests() { doCommand C# mvc "$@" new restore build run multi-rid-publish doCommand C# webapi "$@" new restore build multi-rid-publish doCommand C# razor "$@" new restore build run multi-rid-publish - doCommand C# blazorwasm "$@" new restore build run publish + # doCommand C# blazorwasm "$@" new restore build run publish doCommand C# blazorserver "$@" new restore build run publish - doCommand F# web "$@" new restore build run multi-rid-publish - doCommand F# mvc "$@" new restore build run multi-rid-publish - doCommand F# webapi "$@" new restore build run multi-rid-publish + # doCommand F# web "$@" new restore build run multi-rid-publish + # doCommand F# mvc "$@" new restore build run multi-rid-publish + # doCommand F# webapi "$@" new restore build run multi-rid-publish } function runXmlDocTests() { @@ -507,6 +507,128 @@ function runXmlDocTests() { System.Xml.Serialization.xml System.Xml.xml System.Xml.XmlDocument.xml + Microsoft.CSharp.xml + # Added temporarily due to https://github.com/dotnet/source-build/issues/2404 + Microsoft.VisualBasic.Core.xml + Microsoft.Win32.Primitives.xml + Microsoft.Win32.Registry.xml + System.Collections.Concurrent.xml + System.Collections.Immutable.xml + System.Collections.NonGeneric.xml + System.Collections.Specialized.xml + System.Collections.xml + System.ComponentModel.Annotations.xml + System.ComponentModel.EventBasedAsync.xml + System.ComponentModel.Primitives.xml + System.ComponentModel.TypeConverter.xml + System.ComponentModel.xml + System.Console.xml + System.Data.Common.xml + System.Diagnostics.Contracts.xml + System.Diagnostics.DiagnosticSource.xml + System.Diagnostics.FileVersionInfo.xml + System.Diagnostics.Process.xml + System.Diagnostics.StackTrace.xml + System.Diagnostics.TextWriterTraceListener.xml + System.Diagnostics.TraceSource.xml + System.Diagnostics.Tracing.xml + System.Drawing.Primitives.xml + System.Formats.Asn1.xml + System.IO.Compression.Brotli.xml + System.IO.Compression.ZipFile.xml + System.IO.Compression.xml + System.IO.FileSystem.AccessControl.xml + System.IO.FileSystem.DriveInfo.xml + System.IO.FileSystem.Watcher.xml + System.IO.FileSystem.xml + System.IO.IsolatedStorage.xml + System.IO.MemoryMappedFiles.xml + System.IO.Pipes.AccessControl.xml + System.IO.Pipes.xml + System.Linq.Expressions.xml + System.Linq.Parallel.xml + System.Linq.Queryable.xml + System.Linq.xml + System.Memory.xml + System.Net.Http.Json.xml + System.Net.Http.xml + System.Net.HttpListener.xml + System.Net.Mail.xml + System.Net.NameResolution.xml + System.Net.NetworkInformation.xml + System.Net.Ping.xml + System.Net.Primitives.xml + System.Net.Requests.xml + System.Net.Security.xml + System.Net.ServicePoint.xml + System.Net.Sockets.xml + System.Net.WebClient.xml + System.Net.WebHeaderCollection.xml + System.Net.WebProxy.xml + System.Net.WebSockets.Client.xml + System.Net.WebSockets.xml + System.Numerics.Vectors.xml + System.ObjectModel.xml + System.Reflection.DispatchProxy.xml + System.Reflection.Emit.ILGeneration.xml + System.Reflection.Emit.Lightweight.xml + System.Reflection.Emit.xml + System.Reflection.Metadata.xml + System.Reflection.Primitives.xml + System.Reflection.TypeExtensions.xml + System.Resources.Writer.xml + System.Runtime.CompilerServices.Unsafe.xml + System.Runtime.CompilerServices.VisualC.xml + System.Runtime.InteropServices.RuntimeInformation.xml + System.Runtime.InteropServices.xml + System.Runtime.Intrinsics.xml + System.Runtime.Loader.xml + System.Runtime.Numerics.xml + System.Runtime.Serialization.Formatters.xml + System.Runtime.Serialization.Json.xml + System.Runtime.Serialization.Primitives.xml + System.Runtime.Serialization.Xml.xml + System.Runtime.xml + System.Security.AccessControl.xml + System.Security.Claims.xml + System.Security.Cryptography.Algorithms.xml + System.Security.Cryptography.Cng.xml + System.Security.Cryptography.Csp.xml + System.Security.Cryptography.Encoding.xml + System.Security.Cryptography.OpenSsl.xml + System.Security.Cryptography.Primitives.xml + System.Security.Cryptography.X509Certificates.xml + System.Security.Principal.Windows.xml + System.Text.Encoding.CodePages.xml + System.Text.Encoding.Extensions.xml + System.Text.Encodings.Web.xml + System.Text.Json.xml + System.Text.Json.SourceGeneration.xml + System.Text.Json.SourceGeneration.resources.xml + System.Text.RegularExpressions.xml + System.Threading.Channels.xml + System.Threading.Overlapped.xml + System.Threading.Tasks.Dataflow.xml + System.Threading.Tasks.Parallel.xml + System.Threading.Thread.xml + System.Threading.ThreadPool.xml + System.Threading.xml + System.Transactions.Local.xml + System.Web.HttpUtility.xml + System.Xml.ReaderWriter.xml + System.Xml.XDocument.xml + System.Xml.XPath.XDocument.xml + System.Xml.XPath.xml + System.Xml.XmlSerializer.xml + WindowsBase.xml + mscorlib.xml + ) + + # Added temporarily due to https://github.com/dotnet/source-build/issues/2404 + aspnetcoreappIgnoreList=( + Microsoft.AspNetCore.App.Analyzers.xml + Microsoft.Extensions.Logging.Generators.resources.xml + Microsoft.Extensions.Logging.Generators.xml ) error=0 @@ -531,6 +653,16 @@ function runXmlDocTests() { fi done fi + # Added temporarily due to https://github.com/dotnet/source-build/issues/2404 + if [[ "$xmlDocFile" == *"/packs/Microsoft.AspNetCore.App.Ref"* ]]; then + xmlFileBasename=$(basename "$xmlDocFile") + for ignoreItem in "${aspnetcoreappIgnoreList[@]}"; do + if [[ "$ignoreItem" == "$xmlFileBasename" ]]; then + skip=1; + break + fi + done + fi if [[ $skip == 0 ]] && [[ ! -f "$xmlDocFile" ]]; then error=1 echo "error: missing $xmlDocFile" From 35719e2fbb674a28266903cc604910133672f6da Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 21 Sep 2021 19:41:55 +0000 Subject: [PATCH 004/140] [release/6.0.1xx] Update dependencies from dotnet/sdk (#12005) [release/6.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.WindowsDesktop.App.Ref: from 6.0.0-rc.2.21461.2 to 6.0.0-rtm.21470.4 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0: from 6.0.0-rc.2.21461.2 to 6.0.0-rtm.21470.4 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0: from 6.0.0-rc.2.21461.2 to 6.0.0-rtm.21470.4 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Ref: from 6.0.0-rc.2.21461.1 to 6.0.0-rtm.21470.22 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.NetCore.TargetingPack.x64.6.0: from 6.0.0-rc.2.21461.1 to 6.0.0-rtm.21470.22 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Runtime.win-x64: from 6.0.0-rc.2.21461.1 to 6.0.0-rtm.21470.22 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Host.win-x64: from 6.0.0-rc.2.21461.1 to 6.0.0-rtm.21470.22 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.DotNetHostResolver: from 6.0.0-rc.2.21461.1 to 6.0.0-rtm.21470.22 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.Platforms: from 6.0.0-rc.2.21461.1 to 6.0.0-rtm.21470.22 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref: from 6.0.0-rc.2.21462.1 to 6.0.0-rtm.21467.1 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 6.0.0-rc.2.21462.1 to 6.0.0-rtm.21467.1 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.0-rc.2.21462.1 to 6.0.0-rtm.21467.1 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0: from 6.0.0-rc.2.21462.1 to 6.0.0-rtm.21467.1 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 6.0.0-rc.2.21462.1 to 6.0.0-rtm.21467.1 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 6.0.0-rc.2.21462.1 to 6.0.0-rtm.21467.1 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Common.ItemTemplates: from 6.0.100-rc.2.21463.2 to 6.0.100-rtm.21465.1 (parent: Microsoft.NET.Sdk) - Microsoft.TemplateEngine.Cli: from 6.0.100-rc.2.21463.2 to 6.0.100-rtm.21465.1 (parent: Microsoft.NET.Sdk) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.0-rc.2.21461.2 to 6.0.0-rtm.21470.4 (parent: Microsoft.NET.Sdk) - Microsoft.Dotnet.WinForms.ProjectTemplates: from 6.0.0-rc.2.21461.3 to 6.0.0-rtm.21466.9 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.0-rc.2.21461.2 to 6.0.0-rtm.21470.4 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Wpf.ProjectTemplates: from 6.0.0-rc.2.21461.2 to 6.0.0-rtm.21466.7 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.Net.Compilers.Toolset: from 4.0.0-5.21457.19 to 4.0.0-5.21471.2 (parent: Microsoft.NET.Sdk) - Microsoft.Build: from 17.0.0-preview-21463-01 to 17.0.0-preview-21470-01 (parent: Microsoft.NET.Sdk) - NuGet.Build.Tasks: from 6.0.0-preview.4.243 to 6.0.0-rc.244 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.0-rc.2.21461.1 to 6.0.0-rtm.21470.22 (parent: Microsoft.NET.Sdk) - Microsoft.NET.Workload.Emscripten.Manifest-6.0.100: from 6.0.0-rc.2.21451.1 to 6.0.0-rc.2.21464.1 (parent: VS.Redist.Common.NetCore.SharedFramework.x64.6.0) - Porting Vlada's change from https://github.com/dotnet/installer/pull/11981 over into 6.0.1xx as it's needed in this PR. - Disable test execution for the ES leg for now as it's triggering failures that will take time to investigate if we decide we want to keep this leg: https://dev.azure.com/dnceng/public/_build/results?buildId=1375668&view=ms.vss-test-web.build-test-results-tab --- .vsts-ci.yml | 2 +- eng/Version.Details.xml | 106 ++++++++++++++--------------- eng/Versions.props | 46 ++++++------- test/EndToEnd/ProjectBuildTests.cs | 2 +- 4 files changed, 78 insertions(+), 78 deletions(-) diff --git a/.vsts-ci.yml b/.vsts-ci.yml index 75d9f9f82..2e6b0b2bc 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -75,7 +75,7 @@ stages: _BuildArchitecture: x64 _DOTNET_CLI_UI_LANGUAGE: es _AdditionalBuildParameters: '' - _TestArg: $(_WindowsTestArg) + _TestArg: '' # Internal-only builds ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: Build_Release_x86: diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5b505cd04..4876a4b77 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,45 +1,45 @@ - + https://github.com/dotnet/windowsdesktop - 8da4caa78db8e0bfb18386d4c6ca943944551f04 + 116ac60a07de0a9e3a99bd6e6fb16b6336ae3edf - + https://github.com/dotnet/windowsdesktop - 8da4caa78db8e0bfb18386d4c6ca943944551f04 + 116ac60a07de0a9e3a99bd6e6fb16b6336ae3edf - + https://github.com/dotnet/windowsdesktop - 8da4caa78db8e0bfb18386d4c6ca943944551f04 + 116ac60a07de0a9e3a99bd6e6fb16b6336ae3edf - + https://github.com/dotnet/windowsdesktop - 8da4caa78db8e0bfb18386d4c6ca943944551f04 + 116ac60a07de0a9e3a99bd6e6fb16b6336ae3edf - + https://github.com/dotnet/runtime - 71fe9fb8ecc11197ad8e7bee0a6c4317a667327c + da9d3777afe61bbcfd16ff70ca150433370b4139 - + https://github.com/dotnet/runtime - 71fe9fb8ecc11197ad8e7bee0a6c4317a667327c + da9d3777afe61bbcfd16ff70ca150433370b4139 - + https://github.com/dotnet/runtime - 71fe9fb8ecc11197ad8e7bee0a6c4317a667327c + da9d3777afe61bbcfd16ff70ca150433370b4139 - + https://github.com/dotnet/runtime - 71fe9fb8ecc11197ad8e7bee0a6c4317a667327c + da9d3777afe61bbcfd16ff70ca150433370b4139 - + https://github.com/dotnet/runtime - 71fe9fb8ecc11197ad8e7bee0a6c4317a667327c + da9d3777afe61bbcfd16ff70ca150433370b4139 - + https://github.com/dotnet/runtime - 71fe9fb8ecc11197ad8e7bee0a6c4317a667327c + da9d3777afe61bbcfd16ff70ca150433370b4139 @@ -47,34 +47,34 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 71fe9fb8ecc11197ad8e7bee0a6c4317a667327c + da9d3777afe61bbcfd16ff70ca150433370b4139 - + https://github.com/dotnet/aspnetcore - baf21f6cf308b81e25cd5c13f7e0bc88ee2488cc + 2fb20b4415cf1402ec437c081d79d8466c6d4e1d - + https://github.com/dotnet/aspnetcore - baf21f6cf308b81e25cd5c13f7e0bc88ee2488cc + 2fb20b4415cf1402ec437c081d79d8466c6d4e1d - + https://github.com/dotnet/aspnetcore - baf21f6cf308b81e25cd5c13f7e0bc88ee2488cc + 2fb20b4415cf1402ec437c081d79d8466c6d4e1d - + https://github.com/dotnet/aspnetcore - baf21f6cf308b81e25cd5c13f7e0bc88ee2488cc + 2fb20b4415cf1402ec437c081d79d8466c6d4e1d - + https://github.com/dotnet/aspnetcore - baf21f6cf308b81e25cd5c13f7e0bc88ee2488cc + 2fb20b4415cf1402ec437c081d79d8466c6d4e1d - + https://github.com/dotnet/aspnetcore - baf21f6cf308b81e25cd5c13f7e0bc88ee2488cc + 2fb20b4415cf1402ec437c081d79d8466c6d4e1d https://github.com/dotnet/test-templates @@ -89,32 +89,32 @@ baf4b38e4f1dbc637efdb41624acbe05b2ff9f35 - + https://github.com/dotnet/templating - 7b1cdc82ac330e5dbb10776173299214619422ac + d691479b3e793e983f4d91f3a935421df1493b08 - + https://github.com/dotnet/templating - 7b1cdc82ac330e5dbb10776173299214619422ac + d691479b3e793e983f4d91f3a935421df1493b08 - + https://github.com/dotnet/sdk - 09168af0a7859da29506d2b73ea08d05513a64bb + af0f154c637c7d2c2be5e7bb01c91645de40fc80 - + https://github.com/dotnet/sdk - 09168af0a7859da29506d2b73ea08d05513a64bb + af0f154c637c7d2c2be5e7bb01c91645de40fc80 - + https://github.com/dotnet/winforms - fe2c8e79cc6bb67d9ef7c96c5b47364ddfbdc30f + 5f525932becdb8846d29136db1e832e27645e7db - + https://github.com/dotnet/wpf - 61634fd9e064574c69a05cbab63e8df3c522f1bd + 004bd018c45002ccc60a06433d5bf1c47bc24187 https://github.com/dotnet/fsharp @@ -135,19 +135,19 @@ linker - + https://github.com/dotnet/roslyn - dae39045cd460ba44053ff2af2217da126c25dbf + 556b14d618a1f01a6a27791a70cb92995368a05b - + https://github.com/dotnet/msbuild - e3e141ff09f1bae32db7ed00f33b17794e66a687 + cb055d28fb0fd51ba872f46105408e7592e6cea8 - + https://github.com/nuget/nuget.client - f82431ecc38a28f396d527446834c7de679a6722 + f4ae349ec18d1ac5d5e7d1b0ed753e1300e9e157 https://github.com/Microsoft/ApplicationInsights-dotnet @@ -158,7 +158,7 @@ https://github.com/aspnet/xdt c01a538851a8ab1a1fbeb2e6243f391fff7587b4 - + https://github.com/dotnet/emsdk 9838ec0843442f761488cfec9cf34612c9f675e6 diff --git a/eng/Versions.props b/eng/Versions.props index 6b3d2b933..81eeab1dd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,15 +23,15 @@ - 6.0.0-rc.2.21461.3 + 6.0.0-rtm.21466.9 - 6.0.0-rc.2.21461.2 + 6.0.0-rtm.21466.7 - 6.0.100-rc.2.21463.2 + 6.0.100-rtm.21465.1 @@ -44,44 +44,44 @@ - 6.0.0-rc.2.21462.1 - 6.0.0-rc.2.21462.1 - 6.0.0-rc.2.21462.1 - 6.0.0-rc.2.21462.1 - 6.0.0-rc.2.21462.1 - 6.0.0-rc.2.21462.1 + 6.0.0-rtm.21467.1 + 6.0.0-rtm.21467.1 + 6.0.0-rtm.21467.1 + 6.0.0-rtm.21467.1 + 6.0.0-rtm.21467.1 + 6.0.0-rtm.21467.1 0.2.0 - 6.0.100-rc.2.21463.10 - 6.0.100-rc.2.21463.10 + 6.0.100-rtm.21471.24 + 6.0.100-rtm.21471.24 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 6.0.0-rc.2.21461.1 + 6.0.0-rtm.21470.22 - 6.0.0-rc.2.21461.1 - 6.0.0-rc.2.21461.1 - 6.0.0-rc.2.21461.1 - 6.0.0-rc.2.21461.1 - 6.0.0-rc.2.21461.1 - 6.0.0-rc.2.21461.1 + 6.0.0-rtm.21470.22 + 6.0.0-rtm.21470.22 + 6.0.0-rtm.21470.22 + 6.0.0-rtm.21470.22 + 6.0.0-rtm.21470.22 + 6.0.0-rtm.21470.22 2.1.0 - 6.0.0-rc.2.21461.2 - 6.0.0-rc.2.21461.2 - 6.0.0-rc.2.21461.2 - 6.0.0-rc.2.21461.2 + 6.0.0-rtm.21470.4 + 6.0.0-rtm.21470.4 + 6.0.0-rtm.21470.4 + 6.0.0-rtm.21470.4 @@ -171,7 +171,7 @@ 12.0.100-rc.1.496 15.0.100-rc.1.496 $(MicrosoftNETCoreAppRefPackageVersion) - 6.0.0-rc.2.21451.1 + 6.0.0-rc.2.21464.1 $(MicrosoftNETWorkloadEmscriptenManifest60100Version) diff --git a/test/EndToEnd/ProjectBuildTests.cs b/test/EndToEnd/ProjectBuildTests.cs index 63a4a3dd4..fad27e88f 100644 --- a/test/EndToEnd/ProjectBuildTests.cs +++ b/test/EndToEnd/ProjectBuildTests.cs @@ -176,7 +176,7 @@ namespace EndToEnd.Tests string expectedOutput = @"[\-\s]+ [\w \.]+webapp,razor\s+\[C#\][\w\ \/]+ -[\w \.]+blazorwasm\s+\[C#\][\w\ \/]+ +[\w \.]+blazorserver\s+\[C#\][\w\ \/]+ [\w \.]+classlib\s+\[C#\],F#,VB[\w\ \/]+ [\w \.]+console\s+\[C#\],F#,VB[\w\ \/]+ "; From 112a2ad7a3e96f5f26bd380033d8f5873a072d4c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 21 Sep 2021 20:29:07 +0000 Subject: [PATCH 005/140] Update dependencies from https://github.com/dotnet/sdk build 20210921.32 (#12057) [release/6.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.FSharp.Compiler: from 12.0.0-beta.21457.3 to 12.0.0-beta.21470.3 (parent: Microsoft.NET.Sdk) - Microsoft.SourceBuild.Intermediate.fsharp: from 6.0.0-beta.21457.3 to 6.0.0-beta.21470.3 (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 4876a4b77..b2bc00741 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,14 +98,14 @@ d691479b3e793e983f4d91f3a935421df1493b08 - + https://github.com/dotnet/sdk - af0f154c637c7d2c2be5e7bb01c91645de40fc80 + 4c066447fb06747d3b8f8025261ec741daee312e - + https://github.com/dotnet/sdk - af0f154c637c7d2c2be5e7bb01c91645de40fc80 + 4c066447fb06747d3b8f8025261ec741daee312e @@ -116,13 +116,13 @@ https://github.com/dotnet/wpf 004bd018c45002ccc60a06433d5bf1c47bc24187 - + https://github.com/dotnet/fsharp - b0a54707064024f8959e54027e9e5d8fe49e82c7 + f0b5108c92b92ba5ee440228aadba3bae79b43a3 - + https://github.com/dotnet/fsharp - b0a54707064024f8959e54027e9e5d8fe49e82c7 + f0b5108c92b92ba5ee440228aadba3bae79b43a3 diff --git a/eng/Versions.props b/eng/Versions.props index 81eeab1dd..d27cb08b5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.100-rtm.21471.24 - 6.0.100-rtm.21471.24 + 6.0.100-rtm.21471.32 + 6.0.100-rtm.21471.32 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 6dd1347ecfe7688f396849a92440bad9ecba63d3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 21 Sep 2021 21:16:46 +0000 Subject: [PATCH 006/140] Update dependencies from https://github.com/dotnet/sdk build 20210921.38 (#12059) [release/6.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.AspNetCore.App.Ref: from 6.0.0-rtm.21467.1 to 6.0.0-rtm.21471.15 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 6.0.0-rtm.21467.1 to 6.0.0-rtm.21471.15 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.0-rtm.21467.1 to 6.0.0-rtm.21471.15 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0: from 6.0.0-rtm.21467.1 to 6.0.0-rtm.21471.15 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 6.0.0-rtm.21467.1 to 6.0.0-rtm.21471.15 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 6.0.0-rtm.21467.1 to 6.0.0-rtm.21471.15 (parent: Microsoft.NET.Sdk) --- 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 b2bc00741..193405480 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -51,30 +51,30 @@ https://github.com/dotnet/runtime da9d3777afe61bbcfd16ff70ca150433370b4139 - + https://github.com/dotnet/aspnetcore - 2fb20b4415cf1402ec437c081d79d8466c6d4e1d + b1d50f85d6e727ce4598f6cca469279816394429 - + https://github.com/dotnet/aspnetcore - 2fb20b4415cf1402ec437c081d79d8466c6d4e1d + b1d50f85d6e727ce4598f6cca469279816394429 - + https://github.com/dotnet/aspnetcore - 2fb20b4415cf1402ec437c081d79d8466c6d4e1d + b1d50f85d6e727ce4598f6cca469279816394429 - + https://github.com/dotnet/aspnetcore - 2fb20b4415cf1402ec437c081d79d8466c6d4e1d + b1d50f85d6e727ce4598f6cca469279816394429 - + https://github.com/dotnet/aspnetcore - 2fb20b4415cf1402ec437c081d79d8466c6d4e1d + b1d50f85d6e727ce4598f6cca469279816394429 - + https://github.com/dotnet/aspnetcore - 2fb20b4415cf1402ec437c081d79d8466c6d4e1d + b1d50f85d6e727ce4598f6cca469279816394429 https://github.com/dotnet/test-templates @@ -98,14 +98,14 @@ d691479b3e793e983f4d91f3a935421df1493b08 - + https://github.com/dotnet/sdk - 4c066447fb06747d3b8f8025261ec741daee312e + d045acf75424258d86ea8b05f6806e5ab83dcbcb - + https://github.com/dotnet/sdk - 4c066447fb06747d3b8f8025261ec741daee312e + d045acf75424258d86ea8b05f6806e5ab83dcbcb diff --git a/eng/Versions.props b/eng/Versions.props index d27cb08b5..d14430826 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,20 +44,20 @@ - 6.0.0-rtm.21467.1 - 6.0.0-rtm.21467.1 - 6.0.0-rtm.21467.1 - 6.0.0-rtm.21467.1 - 6.0.0-rtm.21467.1 - 6.0.0-rtm.21467.1 + 6.0.0-rtm.21471.15 + 6.0.0-rtm.21471.15 + 6.0.0-rtm.21471.15 + 6.0.0-rtm.21471.15 + 6.0.0-rtm.21471.15 + 6.0.0-rtm.21471.15 0.2.0 - 6.0.100-rtm.21471.32 - 6.0.100-rtm.21471.32 + 6.0.100-rtm.21471.38 + 6.0.100-rtm.21471.38 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 67b1eae792ed9397428c7db33674aec0cc8fc5ab Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 21 Sep 2021 22:00:43 +0000 Subject: [PATCH 007/140] Update dependencies from https://github.com/dotnet/sdk build 20210921.44 (#12060) [release/6.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.WindowsDesktop.App.Ref: from 6.0.0-rtm.21470.4 to 6.0.0-rtm.21471.2 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0: from 6.0.0-rtm.21470.4 to 6.0.0-rtm.21471.2 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0: from 6.0.0-rtm.21470.4 to 6.0.0-rtm.21471.2 (parent: Microsoft.NET.Sdk) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.0-rtm.21470.4 to 6.0.0-rtm.21471.2 (parent: Microsoft.NET.Sdk) - Microsoft.Dotnet.WinForms.ProjectTemplates: from 6.0.0-rtm.21466.9 to 6.0.0-rtm.21471.4 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.0-rtm.21470.4 to 6.0.0-rtm.21471.2 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Wpf.ProjectTemplates: from 6.0.0-rtm.21466.7 to 6.0.0-rtm.21471.3 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) --- 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 193405480..62609cb80 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,21 +1,21 @@ - + https://github.com/dotnet/windowsdesktop - 116ac60a07de0a9e3a99bd6e6fb16b6336ae3edf + 10500b8eaaf017648abdc5efab3fac916d471ede - + https://github.com/dotnet/windowsdesktop - 116ac60a07de0a9e3a99bd6e6fb16b6336ae3edf + 10500b8eaaf017648abdc5efab3fac916d471ede - + https://github.com/dotnet/windowsdesktop - 116ac60a07de0a9e3a99bd6e6fb16b6336ae3edf + 10500b8eaaf017648abdc5efab3fac916d471ede - + https://github.com/dotnet/windowsdesktop - 116ac60a07de0a9e3a99bd6e6fb16b6336ae3edf + 10500b8eaaf017648abdc5efab3fac916d471ede https://github.com/dotnet/runtime @@ -98,23 +98,23 @@ d691479b3e793e983f4d91f3a935421df1493b08 - + https://github.com/dotnet/sdk - d045acf75424258d86ea8b05f6806e5ab83dcbcb + 6ef67f8c732572acf0ae6ba5c98c468a26558ef8 - + https://github.com/dotnet/sdk - d045acf75424258d86ea8b05f6806e5ab83dcbcb + 6ef67f8c732572acf0ae6ba5c98c468a26558ef8 - + https://github.com/dotnet/winforms - 5f525932becdb8846d29136db1e832e27645e7db + f8841f133107ea2473c185d2b4f438dde598ed7f - + https://github.com/dotnet/wpf - 004bd018c45002ccc60a06433d5bf1c47bc24187 + d0e5c8c8d200702b53d29ef4564f9b0c187d4cf2 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index d14430826..737125d7b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.0-rtm.21466.9 + 6.0.0-rtm.21471.4 - 6.0.0-rtm.21466.7 + 6.0.0-rtm.21471.3 @@ -56,8 +56,8 @@ - 6.0.100-rtm.21471.38 - 6.0.100-rtm.21471.38 + 6.0.100-rtm.21471.44 + 6.0.100-rtm.21471.44 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,10 +78,10 @@ - 6.0.0-rtm.21470.4 - 6.0.0-rtm.21470.4 - 6.0.0-rtm.21470.4 - 6.0.0-rtm.21470.4 + 6.0.0-rtm.21471.2 + 6.0.0-rtm.21471.2 + 6.0.0-rtm.21471.2 + 6.0.0-rtm.21471.2 From bbc01a2a44702d9c3fe78d0f9579eda363befc16 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 21 Sep 2021 23:10:16 +0000 Subject: [PATCH 008/140] Update dependencies from https://github.com/dotnet/sdk build 20210921.52 (#12062) [release/6.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.Build: from 17.0.0-preview-21470-01 to 17.0.0-preview-21471-02 (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 62609cb80..1ee70ace6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,14 +98,14 @@ d691479b3e793e983f4d91f3a935421df1493b08 - + https://github.com/dotnet/sdk - 6ef67f8c732572acf0ae6ba5c98c468a26558ef8 + ae29ef60a8d712ca135f0bda8a68f996a02f7810 - + https://github.com/dotnet/sdk - 6ef67f8c732572acf0ae6ba5c98c468a26558ef8 + ae29ef60a8d712ca135f0bda8a68f996a02f7810 @@ -140,9 +140,9 @@ 556b14d618a1f01a6a27791a70cb92995368a05b - + https://github.com/dotnet/msbuild - cb055d28fb0fd51ba872f46105408e7592e6cea8 + 2f1e9cad51097aec5d7268a4afdf7ad9bc6864b9 diff --git a/eng/Versions.props b/eng/Versions.props index 737125d7b..9019e7072 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.100-rtm.21471.44 - 6.0.100-rtm.21471.44 + 6.0.100-rtm.21471.52 + 6.0.100-rtm.21471.52 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 0e4ac5b8218d99108d009157d943aaa2d0066f12 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 22 Sep 2021 00:37:05 +0000 Subject: [PATCH 009/140] Update dependencies from https://github.com/dotnet/sdk build 20210921.58 (#12063) [release/6.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.AspNetCore.App.Ref: from 6.0.0-rtm.21471.15 to 6.0.0-rtm.21471.25 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 6.0.0-rtm.21471.15 to 6.0.0-rtm.21471.25 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.0-rtm.21471.15 to 6.0.0-rtm.21471.25 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0: from 6.0.0-rtm.21471.15 to 6.0.0-rtm.21471.25 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 6.0.0-rtm.21471.15 to 6.0.0-rtm.21471.25 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 6.0.0-rtm.21471.15 to 6.0.0-rtm.21471.25 (parent: Microsoft.NET.Sdk) - Microsoft.NET.Test.Sdk: from 17.0.0-release-20210908-02 to 17.0.0-release-20210921-03 (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 1ee70ace6..ca3529b38 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -51,30 +51,30 @@ https://github.com/dotnet/runtime da9d3777afe61bbcfd16ff70ca150433370b4139 - + https://github.com/dotnet/aspnetcore - b1d50f85d6e727ce4598f6cca469279816394429 + 2d773c9e4267d57d3a500c12c7ebdbda07da77b9 - + https://github.com/dotnet/aspnetcore - b1d50f85d6e727ce4598f6cca469279816394429 + 2d773c9e4267d57d3a500c12c7ebdbda07da77b9 - + https://github.com/dotnet/aspnetcore - b1d50f85d6e727ce4598f6cca469279816394429 + 2d773c9e4267d57d3a500c12c7ebdbda07da77b9 - + https://github.com/dotnet/aspnetcore - b1d50f85d6e727ce4598f6cca469279816394429 + 2d773c9e4267d57d3a500c12c7ebdbda07da77b9 - + https://github.com/dotnet/aspnetcore - b1d50f85d6e727ce4598f6cca469279816394429 + 2d773c9e4267d57d3a500c12c7ebdbda07da77b9 - + https://github.com/dotnet/aspnetcore - b1d50f85d6e727ce4598f6cca469279816394429 + 2d773c9e4267d57d3a500c12c7ebdbda07da77b9 https://github.com/dotnet/test-templates @@ -98,14 +98,14 @@ d691479b3e793e983f4d91f3a935421df1493b08 - + https://github.com/dotnet/sdk - ae29ef60a8d712ca135f0bda8a68f996a02f7810 + 486b8575543927699a0d879cb41bb07b285c060a - + https://github.com/dotnet/sdk - ae29ef60a8d712ca135f0bda8a68f996a02f7810 + 486b8575543927699a0d879cb41bb07b285c060a @@ -125,9 +125,9 @@ f0b5108c92b92ba5ee440228aadba3bae79b43a3 - + https://github.com/microsoft/vstest - d6f64b37c2cfee76c8b1269d688384ced30ecd21 + fd2827e14e9ef99b3eb2a321fa1b8af4830b085d https://github.com/mono/linker diff --git a/eng/Versions.props b/eng/Versions.props index 9019e7072..62ab4d5d2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,20 +44,20 @@ - 6.0.0-rtm.21471.15 - 6.0.0-rtm.21471.15 - 6.0.0-rtm.21471.15 - 6.0.0-rtm.21471.15 - 6.0.0-rtm.21471.15 - 6.0.0-rtm.21471.15 + 6.0.0-rtm.21471.25 + 6.0.0-rtm.21471.25 + 6.0.0-rtm.21471.25 + 6.0.0-rtm.21471.25 + 6.0.0-rtm.21471.25 + 6.0.0-rtm.21471.25 0.2.0 - 6.0.100-rtm.21471.52 - 6.0.100-rtm.21471.52 + 6.0.100-rtm.21471.58 + 6.0.100-rtm.21471.58 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -150,7 +150,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.0.0-release-20210908-02 + 17.0.0-release-20210921-03 From e8c0bf12f3291d6f9602d767a25dfa56537e4dc1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 22 Sep 2021 02:27:57 +0000 Subject: [PATCH 010/140] Update dependencies from https://github.com/dotnet/sdk build 20210921.64 (#12065) [release/6.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.Net.Compilers.Toolset: from 4.0.0-5.21471.2 to 4.0.0-5.21471.10 (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 ca3529b38..6cb647c50 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,14 +98,14 @@ d691479b3e793e983f4d91f3a935421df1493b08 - + https://github.com/dotnet/sdk - 486b8575543927699a0d879cb41bb07b285c060a + 8a91d2744a2ce9d74f02f34fa9a8e3223b538446 - + https://github.com/dotnet/sdk - 486b8575543927699a0d879cb41bb07b285c060a + 8a91d2744a2ce9d74f02f34fa9a8e3223b538446 @@ -135,9 +135,9 @@ linker - + https://github.com/dotnet/roslyn - 556b14d618a1f01a6a27791a70cb92995368a05b + c8632bc90d4339fa21a2e7f0dd4c45ab7002ecc1 diff --git a/eng/Versions.props b/eng/Versions.props index 62ab4d5d2..eeac83d7f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.100-rtm.21471.58 - 6.0.100-rtm.21471.58 + 6.0.100-rtm.21471.64 + 6.0.100-rtm.21471.64 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From e047be66f4a9e2c8e859cb340779b6901941db6d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 22 Sep 2021 05:28:58 +0000 Subject: [PATCH 011/140] Update dependencies from https://github.com/dotnet/sdk build 20210921.74 (#12067) [release/6.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.NETCore.App.Ref: from 6.0.0-rtm.21470.22 to 6.0.0-rtm.21471.19 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.NetCore.TargetingPack.x64.6.0: from 6.0.0-rtm.21470.22 to 6.0.0-rtm.21471.19 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Runtime.win-x64: from 6.0.0-rtm.21470.22 to 6.0.0-rtm.21471.19 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Host.win-x64: from 6.0.0-rtm.21470.22 to 6.0.0-rtm.21471.19 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.DotNetHostResolver: from 6.0.0-rtm.21470.22 to 6.0.0-rtm.21471.19 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.Platforms: from 6.0.0-rtm.21470.22 to 6.0.0-rtm.21471.19 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.0-rtm.21470.22 to 6.0.0-rtm.21471.19 (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 6cb647c50..59a657ad9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,29 +17,29 @@ https://github.com/dotnet/windowsdesktop 10500b8eaaf017648abdc5efab3fac916d471ede - + https://github.com/dotnet/runtime - da9d3777afe61bbcfd16ff70ca150433370b4139 + 036cb862a4e99b1fa035f654debad7091646fbe4 - + https://github.com/dotnet/runtime - da9d3777afe61bbcfd16ff70ca150433370b4139 + 036cb862a4e99b1fa035f654debad7091646fbe4 - + https://github.com/dotnet/runtime - da9d3777afe61bbcfd16ff70ca150433370b4139 + 036cb862a4e99b1fa035f654debad7091646fbe4 - + https://github.com/dotnet/runtime - da9d3777afe61bbcfd16ff70ca150433370b4139 + 036cb862a4e99b1fa035f654debad7091646fbe4 - + https://github.com/dotnet/runtime - da9d3777afe61bbcfd16ff70ca150433370b4139 + 036cb862a4e99b1fa035f654debad7091646fbe4 - + https://github.com/dotnet/runtime - da9d3777afe61bbcfd16ff70ca150433370b4139 + 036cb862a4e99b1fa035f654debad7091646fbe4 @@ -47,9 +47,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - da9d3777afe61bbcfd16ff70ca150433370b4139 + 036cb862a4e99b1fa035f654debad7091646fbe4 https://github.com/dotnet/aspnetcore @@ -98,14 +98,14 @@ d691479b3e793e983f4d91f3a935421df1493b08 - + https://github.com/dotnet/sdk - 8a91d2744a2ce9d74f02f34fa9a8e3223b538446 + 15d443a251c418a2f6302f7e8d5b20f6f03d835d - + https://github.com/dotnet/sdk - 8a91d2744a2ce9d74f02f34fa9a8e3223b538446 + 15d443a251c418a2f6302f7e8d5b20f6f03d835d diff --git a/eng/Versions.props b/eng/Versions.props index eeac83d7f..23b57573c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,24 +56,24 @@ - 6.0.100-rtm.21471.64 - 6.0.100-rtm.21471.64 + 6.0.100-rtm.21471.74 + 6.0.100-rtm.21471.74 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 6.0.0-rtm.21470.22 + 6.0.0-rtm.21471.19 - 6.0.0-rtm.21470.22 - 6.0.0-rtm.21470.22 - 6.0.0-rtm.21470.22 - 6.0.0-rtm.21470.22 - 6.0.0-rtm.21470.22 - 6.0.0-rtm.21470.22 + 6.0.0-rtm.21471.19 + 6.0.0-rtm.21471.19 + 6.0.0-rtm.21471.19 + 6.0.0-rtm.21471.19 + 6.0.0-rtm.21471.19 + 6.0.0-rtm.21471.19 2.1.0 From 6a4f82e8a219e11170ef0e0e43f18355ff5dab1c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 22 Sep 2021 07:43:45 +0000 Subject: [PATCH 012/140] Update dependencies from https://github.com/dotnet/sdk build 20210921.80 (#12068) [release/6.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.AspNetCore.App.Ref: from 6.0.0-rtm.21471.25 to 6.0.0-rtm.21471.42 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 6.0.0-rtm.21471.25 to 6.0.0-rtm.21471.42 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.0-rtm.21471.25 to 6.0.0-rtm.21471.42 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0: from 6.0.0-rtm.21471.25 to 6.0.0-rtm.21471.42 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 6.0.0-rtm.21471.25 to 6.0.0-rtm.21471.42 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 6.0.0-rtm.21471.25 to 6.0.0-rtm.21471.42 (parent: Microsoft.NET.Sdk) - Microsoft.Net.Compilers.Toolset: from 4.0.0-5.21471.10 to 4.0.0-5.21471.19 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 36 ++++++++++++++++++------------------ eng/Versions.props | 16 ++++++++-------- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 59a657ad9..4996c0b5f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -51,30 +51,30 @@ https://github.com/dotnet/runtime 036cb862a4e99b1fa035f654debad7091646fbe4 - + https://github.com/dotnet/aspnetcore - 2d773c9e4267d57d3a500c12c7ebdbda07da77b9 + 5fdc4ccd6dcaa12c7e83a166f1deb49ccfa30a70 - + https://github.com/dotnet/aspnetcore - 2d773c9e4267d57d3a500c12c7ebdbda07da77b9 + 5fdc4ccd6dcaa12c7e83a166f1deb49ccfa30a70 - + https://github.com/dotnet/aspnetcore - 2d773c9e4267d57d3a500c12c7ebdbda07da77b9 + 5fdc4ccd6dcaa12c7e83a166f1deb49ccfa30a70 - + https://github.com/dotnet/aspnetcore - 2d773c9e4267d57d3a500c12c7ebdbda07da77b9 + 5fdc4ccd6dcaa12c7e83a166f1deb49ccfa30a70 - + https://github.com/dotnet/aspnetcore - 2d773c9e4267d57d3a500c12c7ebdbda07da77b9 + 5fdc4ccd6dcaa12c7e83a166f1deb49ccfa30a70 - + https://github.com/dotnet/aspnetcore - 2d773c9e4267d57d3a500c12c7ebdbda07da77b9 + 5fdc4ccd6dcaa12c7e83a166f1deb49ccfa30a70 https://github.com/dotnet/test-templates @@ -98,14 +98,14 @@ d691479b3e793e983f4d91f3a935421df1493b08 - + https://github.com/dotnet/sdk - 15d443a251c418a2f6302f7e8d5b20f6f03d835d + bef21dd155cad9faa345e1f41c8757bb7569c8d0 - + https://github.com/dotnet/sdk - 15d443a251c418a2f6302f7e8d5b20f6f03d835d + bef21dd155cad9faa345e1f41c8757bb7569c8d0 @@ -135,9 +135,9 @@ linker - + https://github.com/dotnet/roslyn - c8632bc90d4339fa21a2e7f0dd4c45ab7002ecc1 + 2cb3d482e3c09760d1b204c597be93f49dba3349 diff --git a/eng/Versions.props b/eng/Versions.props index 23b57573c..183f59f29 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,20 +44,20 @@ - 6.0.0-rtm.21471.25 - 6.0.0-rtm.21471.25 - 6.0.0-rtm.21471.25 - 6.0.0-rtm.21471.25 - 6.0.0-rtm.21471.25 - 6.0.0-rtm.21471.25 + 6.0.0-rtm.21471.42 + 6.0.0-rtm.21471.42 + 6.0.0-rtm.21471.42 + 6.0.0-rtm.21471.42 + 6.0.0-rtm.21471.42 + 6.0.0-rtm.21471.42 0.2.0 - 6.0.100-rtm.21471.74 - 6.0.100-rtm.21471.74 + 6.0.100-rtm.21471.80 + 6.0.100-rtm.21471.80 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 06123d8e7494c1944ca9707fbd1bd17dad99ff26 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 22 Sep 2021 09:20:05 +0000 Subject: [PATCH 013/140] Update dependencies from https://github.com/dotnet/sdk build 20210922.2 (#12069) [release/6.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.AspNetCore.App.Ref: from 6.0.0-rtm.21471.42 to 6.0.0-rtm.21471.45 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 6.0.0-rtm.21471.42 to 6.0.0-rtm.21471.45 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.0-rtm.21471.42 to 6.0.0-rtm.21471.45 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0: from 6.0.0-rtm.21471.42 to 6.0.0-rtm.21471.45 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 6.0.0-rtm.21471.42 to 6.0.0-rtm.21471.45 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 6.0.0-rtm.21471.42 to 6.0.0-rtm.21471.45 (parent: Microsoft.NET.Sdk) --- 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 4996c0b5f..576e11e49 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -51,30 +51,30 @@ https://github.com/dotnet/runtime 036cb862a4e99b1fa035f654debad7091646fbe4 - + https://github.com/dotnet/aspnetcore - 5fdc4ccd6dcaa12c7e83a166f1deb49ccfa30a70 + 305faeeec55e918be4c0624169dcd6ed0035b7cc - + https://github.com/dotnet/aspnetcore - 5fdc4ccd6dcaa12c7e83a166f1deb49ccfa30a70 + 305faeeec55e918be4c0624169dcd6ed0035b7cc - + https://github.com/dotnet/aspnetcore - 5fdc4ccd6dcaa12c7e83a166f1deb49ccfa30a70 + 305faeeec55e918be4c0624169dcd6ed0035b7cc - + https://github.com/dotnet/aspnetcore - 5fdc4ccd6dcaa12c7e83a166f1deb49ccfa30a70 + 305faeeec55e918be4c0624169dcd6ed0035b7cc - + https://github.com/dotnet/aspnetcore - 5fdc4ccd6dcaa12c7e83a166f1deb49ccfa30a70 + 305faeeec55e918be4c0624169dcd6ed0035b7cc - + https://github.com/dotnet/aspnetcore - 5fdc4ccd6dcaa12c7e83a166f1deb49ccfa30a70 + 305faeeec55e918be4c0624169dcd6ed0035b7cc https://github.com/dotnet/test-templates @@ -98,14 +98,14 @@ d691479b3e793e983f4d91f3a935421df1493b08 - + https://github.com/dotnet/sdk - bef21dd155cad9faa345e1f41c8757bb7569c8d0 + d13d9289012cfcfb3203f675af9df12c160acc96 - + https://github.com/dotnet/sdk - bef21dd155cad9faa345e1f41c8757bb7569c8d0 + d13d9289012cfcfb3203f675af9df12c160acc96 diff --git a/eng/Versions.props b/eng/Versions.props index 183f59f29..c8472ea0c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,20 +44,20 @@ - 6.0.0-rtm.21471.42 - 6.0.0-rtm.21471.42 - 6.0.0-rtm.21471.42 - 6.0.0-rtm.21471.42 - 6.0.0-rtm.21471.42 - 6.0.0-rtm.21471.42 + 6.0.0-rtm.21471.45 + 6.0.0-rtm.21471.45 + 6.0.0-rtm.21471.45 + 6.0.0-rtm.21471.45 + 6.0.0-rtm.21471.45 + 6.0.0-rtm.21471.45 0.2.0 - 6.0.100-rtm.21471.80 - 6.0.100-rtm.21471.80 + 6.0.100-rtm.21472.2 + 6.0.100-rtm.21472.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 564204acc86bb5b389cdcdee8819b61b46487b86 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 22 Sep 2021 13:20:45 +0000 Subject: [PATCH 014/140] Update dependencies from https://github.com/dotnet/sdk build 20210922.3 (#12071) [release/6.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.DotNet.Common.ItemTemplates: from 6.0.100-rtm.21465.1 to 6.0.100-rtm.21472.3 (parent: Microsoft.NET.Sdk) - Microsoft.TemplateEngine.Cli: from 6.0.100-rtm.21465.1 to 6.0.100-rtm.21472.3 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 576e11e49..573856ecf 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -89,23 +89,23 @@ baf4b38e4f1dbc637efdb41624acbe05b2ff9f35 - + https://github.com/dotnet/templating - d691479b3e793e983f4d91f3a935421df1493b08 + d8b938f45e2b5d112100700c4d86e43f204a0a18 - + https://github.com/dotnet/templating - d691479b3e793e983f4d91f3a935421df1493b08 + d8b938f45e2b5d112100700c4d86e43f204a0a18 - + https://github.com/dotnet/sdk - d13d9289012cfcfb3203f675af9df12c160acc96 + 46020636b1fcd43064d40518845e3293b469df1b - + https://github.com/dotnet/sdk - d13d9289012cfcfb3203f675af9df12c160acc96 + 46020636b1fcd43064d40518845e3293b469df1b diff --git a/eng/Versions.props b/eng/Versions.props index c8472ea0c..ab3ed3763 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,7 +31,7 @@ - 6.0.100-rtm.21465.1 + 6.0.100-rtm.21472.3 @@ -56,8 +56,8 @@ - 6.0.100-rtm.21472.2 - 6.0.100-rtm.21472.2 + 6.0.100-rtm.21472.3 + 6.0.100-rtm.21472.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 99c4e2fff96b0ab5bfb7831bfd87aad2294cf3a7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 22 Sep 2021 22:16:30 +0000 Subject: [PATCH 015/140] Update dependencies from https://github.com/dotnet/sdk build 20210922.20 (#12082) [release/6.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.AspNetCore.App.Ref: from 6.0.0-rtm.21471.45 to 6.0.0-rtm.21472.12 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 6.0.0-rtm.21471.45 to 6.0.0-rtm.21472.12 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.0-rtm.21471.45 to 6.0.0-rtm.21472.12 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0: from 6.0.0-rtm.21471.45 to 6.0.0-rtm.21472.12 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 6.0.0-rtm.21471.45 to 6.0.0-rtm.21472.12 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 6.0.0-rtm.21471.45 to 6.0.0-rtm.21472.12 (parent: Microsoft.NET.Sdk) --- 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 573856ecf..063697f15 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -51,30 +51,30 @@ https://github.com/dotnet/runtime 036cb862a4e99b1fa035f654debad7091646fbe4 - + https://github.com/dotnet/aspnetcore - 305faeeec55e918be4c0624169dcd6ed0035b7cc + 0f1bb7f8e3931a25f5130b65e07401ebd37960e6 - + https://github.com/dotnet/aspnetcore - 305faeeec55e918be4c0624169dcd6ed0035b7cc + 0f1bb7f8e3931a25f5130b65e07401ebd37960e6 - + https://github.com/dotnet/aspnetcore - 305faeeec55e918be4c0624169dcd6ed0035b7cc + 0f1bb7f8e3931a25f5130b65e07401ebd37960e6 - + https://github.com/dotnet/aspnetcore - 305faeeec55e918be4c0624169dcd6ed0035b7cc + 0f1bb7f8e3931a25f5130b65e07401ebd37960e6 - + https://github.com/dotnet/aspnetcore - 305faeeec55e918be4c0624169dcd6ed0035b7cc + 0f1bb7f8e3931a25f5130b65e07401ebd37960e6 - + https://github.com/dotnet/aspnetcore - 305faeeec55e918be4c0624169dcd6ed0035b7cc + 0f1bb7f8e3931a25f5130b65e07401ebd37960e6 https://github.com/dotnet/test-templates @@ -98,14 +98,14 @@ d8b938f45e2b5d112100700c4d86e43f204a0a18 - + https://github.com/dotnet/sdk - 46020636b1fcd43064d40518845e3293b469df1b + 86c749dc2338e551ea4739b4cc8dfc88180e6f66 - + https://github.com/dotnet/sdk - 46020636b1fcd43064d40518845e3293b469df1b + 86c749dc2338e551ea4739b4cc8dfc88180e6f66 diff --git a/eng/Versions.props b/eng/Versions.props index ab3ed3763..9a7fb879e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,20 +44,20 @@ - 6.0.0-rtm.21471.45 - 6.0.0-rtm.21471.45 - 6.0.0-rtm.21471.45 - 6.0.0-rtm.21471.45 - 6.0.0-rtm.21471.45 - 6.0.0-rtm.21471.45 + 6.0.0-rtm.21472.12 + 6.0.0-rtm.21472.12 + 6.0.0-rtm.21472.12 + 6.0.0-rtm.21472.12 + 6.0.0-rtm.21472.12 + 6.0.0-rtm.21472.12 0.2.0 - 6.0.100-rtm.21472.3 - 6.0.100-rtm.21472.3 + 6.0.100-rtm.21472.20 + 6.0.100-rtm.21472.20 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 40072623b981464c168b47343f7f5fc5c39d205d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 22 Sep 2021 23:04:23 +0000 Subject: [PATCH 016/140] Update dependencies from https://github.com/dotnet/sdk build 20210922.23 (#12083) [release/6.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.WindowsDesktop.App.Ref: from 6.0.0-rtm.21471.2 to 6.0.0-rtm.21472.7 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0: from 6.0.0-rtm.21471.2 to 6.0.0-rtm.21472.7 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0: from 6.0.0-rtm.21471.2 to 6.0.0-rtm.21472.7 (parent: Microsoft.NET.Sdk) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.0-rtm.21471.2 to 6.0.0-rtm.21472.7 (parent: Microsoft.NET.Sdk) - Microsoft.Dotnet.WinForms.ProjectTemplates: from 6.0.0-rtm.21471.4 to 6.0.0-rtm.21472.5 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.0-rtm.21471.2 to 6.0.0-rtm.21472.7 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Wpf.ProjectTemplates: from 6.0.0-rtm.21471.3 to 6.0.0-rtm.21472.9 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) --- 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 063697f15..ea88f0d4b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,21 +1,21 @@ - + https://github.com/dotnet/windowsdesktop - 10500b8eaaf017648abdc5efab3fac916d471ede + 555e089b7706b890ee6752d3c52403db2d63285d - + https://github.com/dotnet/windowsdesktop - 10500b8eaaf017648abdc5efab3fac916d471ede + 555e089b7706b890ee6752d3c52403db2d63285d - + https://github.com/dotnet/windowsdesktop - 10500b8eaaf017648abdc5efab3fac916d471ede + 555e089b7706b890ee6752d3c52403db2d63285d - + https://github.com/dotnet/windowsdesktop - 10500b8eaaf017648abdc5efab3fac916d471ede + 555e089b7706b890ee6752d3c52403db2d63285d https://github.com/dotnet/runtime @@ -98,23 +98,23 @@ d8b938f45e2b5d112100700c4d86e43f204a0a18 - + https://github.com/dotnet/sdk - 86c749dc2338e551ea4739b4cc8dfc88180e6f66 + 8d886301989b4a813f9eb78c748028fee8a03a64 - + https://github.com/dotnet/sdk - 86c749dc2338e551ea4739b4cc8dfc88180e6f66 + 8d886301989b4a813f9eb78c748028fee8a03a64 - + https://github.com/dotnet/winforms - f8841f133107ea2473c185d2b4f438dde598ed7f + bf25338146edbcc0daef079ecb061215a4cfd6c2 - + https://github.com/dotnet/wpf - d0e5c8c8d200702b53d29ef4564f9b0c187d4cf2 + be9cba3c1dcf989bb4a2a5aeb04db79dbac4e760 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 9a7fb879e..1608d772b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.0-rtm.21471.4 + 6.0.0-rtm.21472.5 - 6.0.0-rtm.21471.3 + 6.0.0-rtm.21472.9 @@ -56,8 +56,8 @@ - 6.0.100-rtm.21472.20 - 6.0.100-rtm.21472.20 + 6.0.100-rtm.21472.23 + 6.0.100-rtm.21472.23 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,10 +78,10 @@ - 6.0.0-rtm.21471.2 - 6.0.0-rtm.21471.2 - 6.0.0-rtm.21471.2 - 6.0.0-rtm.21471.2 + 6.0.0-rtm.21472.7 + 6.0.0-rtm.21472.7 + 6.0.0-rtm.21472.7 + 6.0.0-rtm.21472.7 From 972bee301e9c3fc500419a20bbe60b0a7eaedaca Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 23 Sep 2021 00:09:23 +0000 Subject: [PATCH 017/140] Update dependencies from https://github.com/dotnet/sdk build 20210922.24 (#12087) [release/6.0.1xx] Update dependencies from dotnet/sdk --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ea88f0d4b..25bfc3c1d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,14 +98,14 @@ d8b938f45e2b5d112100700c4d86e43f204a0a18 - + https://github.com/dotnet/sdk - 8d886301989b4a813f9eb78c748028fee8a03a64 + 95de3088023b389c114bee26497ac9d346aca719 - + https://github.com/dotnet/sdk - 8d886301989b4a813f9eb78c748028fee8a03a64 + 95de3088023b389c114bee26497ac9d346aca719 diff --git a/eng/Versions.props b/eng/Versions.props index 1608d772b..f7752e8e4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.100-rtm.21472.23 - 6.0.100-rtm.21472.23 + 6.0.100-rtm.21472.24 + 6.0.100-rtm.21472.24 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From bf55e62eebda81408f7aef421bcdb94e13b97584 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 23 Sep 2021 00:57:20 +0000 Subject: [PATCH 018/140] Update dependencies from https://github.com/dotnet/sdk build 20210922.27 (#12088) [release/6.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.AspNetCore.App.Ref: from 6.0.0-rtm.21472.12 to 6.0.0-rtm.21472.22 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 6.0.0-rtm.21472.12 to 6.0.0-rtm.21472.22 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.0-rtm.21472.12 to 6.0.0-rtm.21472.22 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0: from 6.0.0-rtm.21472.12 to 6.0.0-rtm.21472.22 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 6.0.0-rtm.21472.12 to 6.0.0-rtm.21472.22 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 6.0.0-rtm.21472.12 to 6.0.0-rtm.21472.22 (parent: Microsoft.NET.Sdk) --- 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 25bfc3c1d..3c07ad3d4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -51,30 +51,30 @@ https://github.com/dotnet/runtime 036cb862a4e99b1fa035f654debad7091646fbe4 - + https://github.com/dotnet/aspnetcore - 0f1bb7f8e3931a25f5130b65e07401ebd37960e6 + 748e56ba707f41b9a9aad5defc09b17590d50cc9 - + https://github.com/dotnet/aspnetcore - 0f1bb7f8e3931a25f5130b65e07401ebd37960e6 + 748e56ba707f41b9a9aad5defc09b17590d50cc9 - + https://github.com/dotnet/aspnetcore - 0f1bb7f8e3931a25f5130b65e07401ebd37960e6 + 748e56ba707f41b9a9aad5defc09b17590d50cc9 - + https://github.com/dotnet/aspnetcore - 0f1bb7f8e3931a25f5130b65e07401ebd37960e6 + 748e56ba707f41b9a9aad5defc09b17590d50cc9 - + https://github.com/dotnet/aspnetcore - 0f1bb7f8e3931a25f5130b65e07401ebd37960e6 + 748e56ba707f41b9a9aad5defc09b17590d50cc9 - + https://github.com/dotnet/aspnetcore - 0f1bb7f8e3931a25f5130b65e07401ebd37960e6 + 748e56ba707f41b9a9aad5defc09b17590d50cc9 https://github.com/dotnet/test-templates @@ -98,14 +98,14 @@ d8b938f45e2b5d112100700c4d86e43f204a0a18 - + https://github.com/dotnet/sdk - 95de3088023b389c114bee26497ac9d346aca719 + fcdec666b3b39af719f550ff3085241804c2d0bc - + https://github.com/dotnet/sdk - 95de3088023b389c114bee26497ac9d346aca719 + fcdec666b3b39af719f550ff3085241804c2d0bc diff --git a/eng/Versions.props b/eng/Versions.props index f7752e8e4..2cc124d95 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,20 +44,20 @@ - 6.0.0-rtm.21472.12 - 6.0.0-rtm.21472.12 - 6.0.0-rtm.21472.12 - 6.0.0-rtm.21472.12 - 6.0.0-rtm.21472.12 - 6.0.0-rtm.21472.12 + 6.0.0-rtm.21472.22 + 6.0.0-rtm.21472.22 + 6.0.0-rtm.21472.22 + 6.0.0-rtm.21472.22 + 6.0.0-rtm.21472.22 + 6.0.0-rtm.21472.22 0.2.0 - 6.0.100-rtm.21472.24 - 6.0.100-rtm.21472.24 + 6.0.100-rtm.21472.27 + 6.0.100-rtm.21472.27 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 9296b94a7fe90b7db1d6d9559268635d665be055 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 23 Sep 2021 01:37:18 +0000 Subject: [PATCH 019/140] Update dependencies from https://github.com/dotnet/sdk build 20210922.32 (#12090) [release/6.0.1xx] Update dependencies from dotnet/sdk --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3c07ad3d4..e5a73a8ca 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,14 +98,14 @@ d8b938f45e2b5d112100700c4d86e43f204a0a18 - + https://github.com/dotnet/sdk - fcdec666b3b39af719f550ff3085241804c2d0bc + 26aae2da2f7ad55ed8fd0a2bd4e21057da5e885f - + https://github.com/dotnet/sdk - fcdec666b3b39af719f550ff3085241804c2d0bc + 26aae2da2f7ad55ed8fd0a2bd4e21057da5e885f diff --git a/eng/Versions.props b/eng/Versions.props index 2cc124d95..ce7b4f3fe 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.100-rtm.21472.27 - 6.0.100-rtm.21472.27 + 6.0.100-rtm.21472.32 + 6.0.100-rtm.21472.32 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From fd54b7e44c82df0f621de08a286f0aa82ee5beee Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 23 Sep 2021 02:24:20 +0000 Subject: [PATCH 020/140] Update dependencies from https://github.com/dotnet/sdk build 20210922.35 (#12091) [release/6.0.1xx] Update dependencies from dotnet/sdk --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e5a73a8ca..97749a5a2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,14 +98,14 @@ d8b938f45e2b5d112100700c4d86e43f204a0a18 - + https://github.com/dotnet/sdk - 26aae2da2f7ad55ed8fd0a2bd4e21057da5e885f + 075aeb9fbb637e8faab72f3e34119307bb72066e - + https://github.com/dotnet/sdk - 26aae2da2f7ad55ed8fd0a2bd4e21057da5e885f + 075aeb9fbb637e8faab72f3e34119307bb72066e diff --git a/eng/Versions.props b/eng/Versions.props index ce7b4f3fe..65a6435b8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.100-rtm.21472.32 - 6.0.100-rtm.21472.32 + 6.0.100-rtm.21472.35 + 6.0.100-rtm.21472.35 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 83b471c6721c4f06c65796a182e04300e4bde4e3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 23 Sep 2021 03:02:29 +0000 Subject: [PATCH 021/140] Update dependencies from https://github.com/dotnet/sdk build 20210922.39 (#12092) [release/6.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.AspNetCore.App.Ref: from 6.0.0-rtm.21472.22 to 6.0.0-rtm.21472.28 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 6.0.0-rtm.21472.22 to 6.0.0-rtm.21472.28 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.0-rtm.21472.22 to 6.0.0-rtm.21472.28 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0: from 6.0.0-rtm.21472.22 to 6.0.0-rtm.21472.28 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 6.0.0-rtm.21472.22 to 6.0.0-rtm.21472.28 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 6.0.0-rtm.21472.22 to 6.0.0-rtm.21472.28 (parent: Microsoft.NET.Sdk) --- 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 97749a5a2..22828ca80 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -51,30 +51,30 @@ https://github.com/dotnet/runtime 036cb862a4e99b1fa035f654debad7091646fbe4 - + https://github.com/dotnet/aspnetcore - 748e56ba707f41b9a9aad5defc09b17590d50cc9 + 64f1b6e19c0641b944841ebe4216b6df3fb678eb - + https://github.com/dotnet/aspnetcore - 748e56ba707f41b9a9aad5defc09b17590d50cc9 + 64f1b6e19c0641b944841ebe4216b6df3fb678eb - + https://github.com/dotnet/aspnetcore - 748e56ba707f41b9a9aad5defc09b17590d50cc9 + 64f1b6e19c0641b944841ebe4216b6df3fb678eb - + https://github.com/dotnet/aspnetcore - 748e56ba707f41b9a9aad5defc09b17590d50cc9 + 64f1b6e19c0641b944841ebe4216b6df3fb678eb - + https://github.com/dotnet/aspnetcore - 748e56ba707f41b9a9aad5defc09b17590d50cc9 + 64f1b6e19c0641b944841ebe4216b6df3fb678eb - + https://github.com/dotnet/aspnetcore - 748e56ba707f41b9a9aad5defc09b17590d50cc9 + 64f1b6e19c0641b944841ebe4216b6df3fb678eb https://github.com/dotnet/test-templates @@ -98,14 +98,14 @@ d8b938f45e2b5d112100700c4d86e43f204a0a18 - + https://github.com/dotnet/sdk - 075aeb9fbb637e8faab72f3e34119307bb72066e + ceeb96aa6984f145327d48a706c5c6cf6444e7df - + https://github.com/dotnet/sdk - 075aeb9fbb637e8faab72f3e34119307bb72066e + ceeb96aa6984f145327d48a706c5c6cf6444e7df diff --git a/eng/Versions.props b/eng/Versions.props index 65a6435b8..572af8a7a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,20 +44,20 @@ - 6.0.0-rtm.21472.22 - 6.0.0-rtm.21472.22 - 6.0.0-rtm.21472.22 - 6.0.0-rtm.21472.22 - 6.0.0-rtm.21472.22 - 6.0.0-rtm.21472.22 + 6.0.0-rtm.21472.28 + 6.0.0-rtm.21472.28 + 6.0.0-rtm.21472.28 + 6.0.0-rtm.21472.28 + 6.0.0-rtm.21472.28 + 6.0.0-rtm.21472.28 0.2.0 - 6.0.100-rtm.21472.35 - 6.0.100-rtm.21472.35 + 6.0.100-rtm.21472.39 + 6.0.100-rtm.21472.39 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 114e28d2e963e5e73c79d4598a6ae5df97e6522e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 23 Sep 2021 04:23:58 +0000 Subject: [PATCH 022/140] [release/6.0.1xx] Update dependencies from dotnet/sdk (#12093) [release/6.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.NETCore.App.Ref: from 6.0.0-rtm.21471.19 to 6.0.0-rtm.21472.13 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.NetCore.TargetingPack.x64.6.0: from 6.0.0-rtm.21471.19 to 6.0.0-rtm.21472.13 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Runtime.win-x64: from 6.0.0-rtm.21471.19 to 6.0.0-rtm.21472.13 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Host.win-x64: from 6.0.0-rtm.21471.19 to 6.0.0-rtm.21472.13 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.DotNetHostResolver: from 6.0.0-rtm.21471.19 to 6.0.0-rtm.21472.13 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.Platforms: from 6.0.0-rtm.21471.19 to 6.0.0-rtm.21472.13 (parent: Microsoft.NET.Sdk) - Microsoft.FSharp.Compiler: from 12.0.0-beta.21470.3 to 12.0.0-beta.21472.3 (parent: Microsoft.NET.Sdk) - Microsoft.SourceBuild.Intermediate.fsharp: from 6.0.0-beta.21470.3 to 6.0.0-beta.21472.3 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.0-rtm.21471.19 to 6.0.0-rtm.21472.13 (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 22828ca80..1ce4614eb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,29 +17,29 @@ https://github.com/dotnet/windowsdesktop 555e089b7706b890ee6752d3c52403db2d63285d - + https://github.com/dotnet/runtime - 036cb862a4e99b1fa035f654debad7091646fbe4 + 491ed9a112559872c31ae40da8f6d9977ba4ce3a - + https://github.com/dotnet/runtime - 036cb862a4e99b1fa035f654debad7091646fbe4 + 491ed9a112559872c31ae40da8f6d9977ba4ce3a - + https://github.com/dotnet/runtime - 036cb862a4e99b1fa035f654debad7091646fbe4 + 491ed9a112559872c31ae40da8f6d9977ba4ce3a - + https://github.com/dotnet/runtime - 036cb862a4e99b1fa035f654debad7091646fbe4 + 491ed9a112559872c31ae40da8f6d9977ba4ce3a - + https://github.com/dotnet/runtime - 036cb862a4e99b1fa035f654debad7091646fbe4 + 491ed9a112559872c31ae40da8f6d9977ba4ce3a - + https://github.com/dotnet/runtime - 036cb862a4e99b1fa035f654debad7091646fbe4 + 491ed9a112559872c31ae40da8f6d9977ba4ce3a @@ -47,9 +47,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 036cb862a4e99b1fa035f654debad7091646fbe4 + 491ed9a112559872c31ae40da8f6d9977ba4ce3a https://github.com/dotnet/aspnetcore @@ -98,14 +98,14 @@ d8b938f45e2b5d112100700c4d86e43f204a0a18 - + https://github.com/dotnet/sdk - ceeb96aa6984f145327d48a706c5c6cf6444e7df + 930c67b022a447a0f4d948369f0083b7aa18164e - + https://github.com/dotnet/sdk - ceeb96aa6984f145327d48a706c5c6cf6444e7df + 930c67b022a447a0f4d948369f0083b7aa18164e @@ -116,11 +116,11 @@ https://github.com/dotnet/wpf be9cba3c1dcf989bb4a2a5aeb04db79dbac4e760 - + https://github.com/dotnet/fsharp f0b5108c92b92ba5ee440228aadba3bae79b43a3 - + https://github.com/dotnet/fsharp f0b5108c92b92ba5ee440228aadba3bae79b43a3 diff --git a/eng/Versions.props b/eng/Versions.props index 572af8a7a..f2a51aa56 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,24 +56,24 @@ - 6.0.100-rtm.21472.39 - 6.0.100-rtm.21472.39 + 6.0.100-rtm.21472.47 + 6.0.100-rtm.21472.47 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 6.0.0-rtm.21471.19 + 6.0.0-rtm.21472.13 - 6.0.0-rtm.21471.19 - 6.0.0-rtm.21471.19 - 6.0.0-rtm.21471.19 - 6.0.0-rtm.21471.19 - 6.0.0-rtm.21471.19 - 6.0.0-rtm.21471.19 + 6.0.0-rtm.21472.13 + 6.0.0-rtm.21472.13 + 6.0.0-rtm.21472.13 + 6.0.0-rtm.21472.13 + 6.0.0-rtm.21472.13 + 6.0.0-rtm.21472.13 2.1.0 From 015557b938e88fa445083bf0443dcea4cad1148c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 23 Sep 2021 06:26:49 +0000 Subject: [PATCH 023/140] Update dependencies from https://github.com/dotnet/sdk build 20210922.51 (#12095) [release/6.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.WindowsDesktop.App.Ref: from 6.0.0-rtm.21472.7 to 6.0.0-rtm.21472.12 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0: from 6.0.0-rtm.21472.7 to 6.0.0-rtm.21472.12 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0: from 6.0.0-rtm.21472.7 to 6.0.0-rtm.21472.12 (parent: Microsoft.NET.Sdk) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.0-rtm.21472.7 to 6.0.0-rtm.21472.12 (parent: Microsoft.NET.Sdk) - Microsoft.Dotnet.WinForms.ProjectTemplates: from 6.0.0-rtm.21472.5 to 6.0.0-rtm.21472.8 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.0-rtm.21472.7 to 6.0.0-rtm.21472.12 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Wpf.ProjectTemplates: from 6.0.0-rtm.21472.9 to 6.0.0-rtm.21472.12 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) --- 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 1ce4614eb..b504f5e1f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,21 +1,21 @@ - + https://github.com/dotnet/windowsdesktop - 555e089b7706b890ee6752d3c52403db2d63285d + 49a6068987c8bd70bbe520e4a5866d92f8c3b1f4 - + https://github.com/dotnet/windowsdesktop - 555e089b7706b890ee6752d3c52403db2d63285d + 49a6068987c8bd70bbe520e4a5866d92f8c3b1f4 - + https://github.com/dotnet/windowsdesktop - 555e089b7706b890ee6752d3c52403db2d63285d + 49a6068987c8bd70bbe520e4a5866d92f8c3b1f4 - + https://github.com/dotnet/windowsdesktop - 555e089b7706b890ee6752d3c52403db2d63285d + 49a6068987c8bd70bbe520e4a5866d92f8c3b1f4 https://github.com/dotnet/runtime @@ -98,23 +98,23 @@ d8b938f45e2b5d112100700c4d86e43f204a0a18 - + https://github.com/dotnet/sdk - 930c67b022a447a0f4d948369f0083b7aa18164e + 721405fd1883dc6b5ba4cba9fd1fe9fee467f418 - + https://github.com/dotnet/sdk - 930c67b022a447a0f4d948369f0083b7aa18164e + 721405fd1883dc6b5ba4cba9fd1fe9fee467f418 - + https://github.com/dotnet/winforms - bf25338146edbcc0daef079ecb061215a4cfd6c2 + 406fc6353f173c3f4a95645405b8df058203a9ae - + https://github.com/dotnet/wpf - be9cba3c1dcf989bb4a2a5aeb04db79dbac4e760 + 0b49b900f50f8793c29c08b55b8bbf6fd45f652f https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index f2a51aa56..8cddc7386 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.0-rtm.21472.5 + 6.0.0-rtm.21472.8 - 6.0.0-rtm.21472.9 + 6.0.0-rtm.21472.12 @@ -56,8 +56,8 @@ - 6.0.100-rtm.21472.47 - 6.0.100-rtm.21472.47 + 6.0.100-rtm.21472.51 + 6.0.100-rtm.21472.51 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,10 +78,10 @@ - 6.0.0-rtm.21472.7 - 6.0.0-rtm.21472.7 - 6.0.0-rtm.21472.7 - 6.0.0-rtm.21472.7 + 6.0.0-rtm.21472.12 + 6.0.0-rtm.21472.12 + 6.0.0-rtm.21472.12 + 6.0.0-rtm.21472.12 From c07fedd6b9a25fa137af2197a686cae7f7673928 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 23 Sep 2021 12:35:30 +0000 Subject: [PATCH 024/140] Update dependencies from https://github.com/dotnet/sdk build 20210923.8 (#12096) [release/6.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.DotNet.Common.ItemTemplates: from 6.0.100-rtm.21472.3 to 6.0.100-rtm.21473.1 (parent: Microsoft.NET.Sdk) - Microsoft.TemplateEngine.Cli: from 6.0.100-rtm.21472.3 to 6.0.100-rtm.21473.1 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b504f5e1f..746c29761 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -89,23 +89,23 @@ baf4b38e4f1dbc637efdb41624acbe05b2ff9f35 - + https://github.com/dotnet/templating - d8b938f45e2b5d112100700c4d86e43f204a0a18 + 4b53271e35147c45f26df629ae1530b51d574bcb - + https://github.com/dotnet/templating - d8b938f45e2b5d112100700c4d86e43f204a0a18 + 4b53271e35147c45f26df629ae1530b51d574bcb - + https://github.com/dotnet/sdk - 721405fd1883dc6b5ba4cba9fd1fe9fee467f418 + f8c0b9e127a84fc3a3469f18383a7202a6932630 - + https://github.com/dotnet/sdk - 721405fd1883dc6b5ba4cba9fd1fe9fee467f418 + f8c0b9e127a84fc3a3469f18383a7202a6932630 diff --git a/eng/Versions.props b/eng/Versions.props index 8cddc7386..65b4f4e81 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,7 +31,7 @@ - 6.0.100-rtm.21472.3 + 6.0.100-rtm.21473.1 @@ -56,8 +56,8 @@ - 6.0.100-rtm.21472.51 - 6.0.100-rtm.21472.51 + 6.0.100-rtm.21473.8 + 6.0.100-rtm.21473.8 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 33c03984a9994a285369c4d40a123c6a980cea31 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 23 Sep 2021 13:21:17 +0000 Subject: [PATCH 025/140] Update dependencies from https://github.com/dotnet/sdk build 20210923.10 (#12098) [release/6.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.AspNetCore.App.Ref: from 6.0.0-rtm.21472.28 to 6.0.0-rtm.21473.1 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 6.0.0-rtm.21472.28 to 6.0.0-rtm.21473.1 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.0-rtm.21472.28 to 6.0.0-rtm.21473.1 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0: from 6.0.0-rtm.21472.28 to 6.0.0-rtm.21473.1 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 6.0.0-rtm.21472.28 to 6.0.0-rtm.21473.1 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 6.0.0-rtm.21472.28 to 6.0.0-rtm.21473.1 (parent: Microsoft.NET.Sdk) --- 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 746c29761..57bca547b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -51,30 +51,30 @@ https://github.com/dotnet/runtime 491ed9a112559872c31ae40da8f6d9977ba4ce3a - + https://github.com/dotnet/aspnetcore - 64f1b6e19c0641b944841ebe4216b6df3fb678eb + f19197ec20721d4e0d8b72f620b9d85ffdde2223 - + https://github.com/dotnet/aspnetcore - 64f1b6e19c0641b944841ebe4216b6df3fb678eb + f19197ec20721d4e0d8b72f620b9d85ffdde2223 - + https://github.com/dotnet/aspnetcore - 64f1b6e19c0641b944841ebe4216b6df3fb678eb + f19197ec20721d4e0d8b72f620b9d85ffdde2223 - + https://github.com/dotnet/aspnetcore - 64f1b6e19c0641b944841ebe4216b6df3fb678eb + f19197ec20721d4e0d8b72f620b9d85ffdde2223 - + https://github.com/dotnet/aspnetcore - 64f1b6e19c0641b944841ebe4216b6df3fb678eb + f19197ec20721d4e0d8b72f620b9d85ffdde2223 - + https://github.com/dotnet/aspnetcore - 64f1b6e19c0641b944841ebe4216b6df3fb678eb + f19197ec20721d4e0d8b72f620b9d85ffdde2223 https://github.com/dotnet/test-templates @@ -98,14 +98,14 @@ 4b53271e35147c45f26df629ae1530b51d574bcb - + https://github.com/dotnet/sdk - f8c0b9e127a84fc3a3469f18383a7202a6932630 + 67890e5ad4f6e30836a5e604af8c1418f634a49e - + https://github.com/dotnet/sdk - f8c0b9e127a84fc3a3469f18383a7202a6932630 + 67890e5ad4f6e30836a5e604af8c1418f634a49e diff --git a/eng/Versions.props b/eng/Versions.props index 65b4f4e81..b95aa37c6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,20 +44,20 @@ - 6.0.0-rtm.21472.28 - 6.0.0-rtm.21472.28 - 6.0.0-rtm.21472.28 - 6.0.0-rtm.21472.28 - 6.0.0-rtm.21472.28 - 6.0.0-rtm.21472.28 + 6.0.0-rtm.21473.1 + 6.0.0-rtm.21473.1 + 6.0.0-rtm.21473.1 + 6.0.0-rtm.21473.1 + 6.0.0-rtm.21473.1 + 6.0.0-rtm.21473.1 0.2.0 - 6.0.100-rtm.21473.8 - 6.0.100-rtm.21473.8 + 6.0.100-rtm.21473.10 + 6.0.100-rtm.21473.10 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From add2dc368175992e5c351c366194967cec9b0d13 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 23 Sep 2021 17:22:30 +0000 Subject: [PATCH 026/140] Update dependencies from https://github.com/dotnet/test-templates build 20210923.2 (#12102) [release/6.0.1xx] Update dependencies from dotnet/test-templates --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 57bca547b..e2d5e4f37 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -76,17 +76,17 @@ https://github.com/dotnet/aspnetcore f19197ec20721d4e0d8b72f620b9d85ffdde2223 - + https://github.com/dotnet/test-templates - baf4b38e4f1dbc637efdb41624acbe05b2ff9f35 + c40ef7e056b48e011c43a21354d6790ba6b8b4fc - + https://github.com/dotnet/test-templates - baf4b38e4f1dbc637efdb41624acbe05b2ff9f35 + c40ef7e056b48e011c43a21354d6790ba6b8b4fc - + https://github.com/dotnet/test-templates - baf4b38e4f1dbc637efdb41624acbe05b2ff9f35 + c40ef7e056b48e011c43a21354d6790ba6b8b4fc diff --git a/eng/Versions.props b/eng/Versions.props index b95aa37c6..767a6eee4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -35,8 +35,8 @@ - 1.0.2-beta4.21416.1 - 1.0.2-beta4.21416.1 + 1.0.2-beta4.21473.2 + 1.0.2-beta4.21473.2 @@ -143,7 +143,7 @@ 1.5.3 1.0.2-beta3 $(MicrosoftDotNetCommonItemTemplates21PackageVersion) - 1.0.2-beta4.21416.1 + 1.0.2-beta4.21473.2 2.1.30 From 0d5d4cde5a94a347d217292e12279f72b092c013 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 23 Sep 2021 20:02:04 +0000 Subject: [PATCH 027/140] Update dependencies from https://github.com/dotnet/sdk build 20210923.22 (#12105) [release/6.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.AspNetCore.App.Ref: from 6.0.0-rtm.21473.1 to 6.0.0-rtm.21473.6 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 6.0.0-rtm.21473.1 to 6.0.0-rtm.21473.6 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.0-rtm.21473.1 to 6.0.0-rtm.21473.6 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0: from 6.0.0-rtm.21473.1 to 6.0.0-rtm.21473.6 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 6.0.0-rtm.21473.1 to 6.0.0-rtm.21473.6 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 6.0.0-rtm.21473.1 to 6.0.0-rtm.21473.6 (parent: Microsoft.NET.Sdk) --- 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 e2d5e4f37..966c9c21f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -51,30 +51,30 @@ https://github.com/dotnet/runtime 491ed9a112559872c31ae40da8f6d9977ba4ce3a - + https://github.com/dotnet/aspnetcore - f19197ec20721d4e0d8b72f620b9d85ffdde2223 + 7069706471e7986cd769175b44f9c8010c1d9b2a - + https://github.com/dotnet/aspnetcore - f19197ec20721d4e0d8b72f620b9d85ffdde2223 + 7069706471e7986cd769175b44f9c8010c1d9b2a - + https://github.com/dotnet/aspnetcore - f19197ec20721d4e0d8b72f620b9d85ffdde2223 + 7069706471e7986cd769175b44f9c8010c1d9b2a - + https://github.com/dotnet/aspnetcore - f19197ec20721d4e0d8b72f620b9d85ffdde2223 + 7069706471e7986cd769175b44f9c8010c1d9b2a - + https://github.com/dotnet/aspnetcore - f19197ec20721d4e0d8b72f620b9d85ffdde2223 + 7069706471e7986cd769175b44f9c8010c1d9b2a - + https://github.com/dotnet/aspnetcore - f19197ec20721d4e0d8b72f620b9d85ffdde2223 + 7069706471e7986cd769175b44f9c8010c1d9b2a https://github.com/dotnet/test-templates @@ -98,14 +98,14 @@ 4b53271e35147c45f26df629ae1530b51d574bcb - + https://github.com/dotnet/sdk - 67890e5ad4f6e30836a5e604af8c1418f634a49e + ad565b7fdeca396c0c119101ab8a3573291830fd - + https://github.com/dotnet/sdk - 67890e5ad4f6e30836a5e604af8c1418f634a49e + ad565b7fdeca396c0c119101ab8a3573291830fd diff --git a/eng/Versions.props b/eng/Versions.props index 767a6eee4..a21467415 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,20 +44,20 @@ - 6.0.0-rtm.21473.1 - 6.0.0-rtm.21473.1 - 6.0.0-rtm.21473.1 - 6.0.0-rtm.21473.1 - 6.0.0-rtm.21473.1 - 6.0.0-rtm.21473.1 + 6.0.0-rtm.21473.6 + 6.0.0-rtm.21473.6 + 6.0.0-rtm.21473.6 + 6.0.0-rtm.21473.6 + 6.0.0-rtm.21473.6 + 6.0.0-rtm.21473.6 0.2.0 - 6.0.100-rtm.21473.10 - 6.0.100-rtm.21473.10 + 6.0.100-rtm.21473.22 + 6.0.100-rtm.21473.22 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From ae95becee004b5295269c3128aa060707e6f096f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 23 Sep 2021 22:20:23 +0000 Subject: [PATCH 028/140] Update dependencies from https://github.com/dotnet/sdk build 20210923.37 (#12107) [release/6.0.1xx] Update dependencies from dotnet/sdk --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 966c9c21f..a1fc2abb4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,14 +98,14 @@ 4b53271e35147c45f26df629ae1530b51d574bcb - + https://github.com/dotnet/sdk - ad565b7fdeca396c0c119101ab8a3573291830fd + d90df99131350252c2aa2be5cd2ea28f223d183c - + https://github.com/dotnet/sdk - ad565b7fdeca396c0c119101ab8a3573291830fd + d90df99131350252c2aa2be5cd2ea28f223d183c diff --git a/eng/Versions.props b/eng/Versions.props index a21467415..5abecef8d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.100-rtm.21473.22 - 6.0.100-rtm.21473.22 + 6.0.100-rtm.21473.37 + 6.0.100-rtm.21473.37 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From b7ba9f4d9eaa09085846e056700f6ced23315f6f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 23 Sep 2021 23:05:09 +0000 Subject: [PATCH 029/140] Update dependencies from https://github.com/dotnet/sdk build 20210923.39 (#12108) [release/6.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.AspNetCore.App.Ref: from 6.0.0-rtm.21473.6 to 6.0.0-rtm.21473.21 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 6.0.0-rtm.21473.6 to 6.0.0-rtm.21473.21 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.0-rtm.21473.6 to 6.0.0-rtm.21473.21 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0: from 6.0.0-rtm.21473.6 to 6.0.0-rtm.21473.21 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 6.0.0-rtm.21473.6 to 6.0.0-rtm.21473.21 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 6.0.0-rtm.21473.6 to 6.0.0-rtm.21473.21 (parent: Microsoft.NET.Sdk) --- 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 a1fc2abb4..a5eb21dd8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -51,30 +51,30 @@ https://github.com/dotnet/runtime 491ed9a112559872c31ae40da8f6d9977ba4ce3a - + https://github.com/dotnet/aspnetcore - 7069706471e7986cd769175b44f9c8010c1d9b2a + 68569a0a22c18b5bd8844feee266d9da301de9cb - + https://github.com/dotnet/aspnetcore - 7069706471e7986cd769175b44f9c8010c1d9b2a + 68569a0a22c18b5bd8844feee266d9da301de9cb - + https://github.com/dotnet/aspnetcore - 7069706471e7986cd769175b44f9c8010c1d9b2a + 68569a0a22c18b5bd8844feee266d9da301de9cb - + https://github.com/dotnet/aspnetcore - 7069706471e7986cd769175b44f9c8010c1d9b2a + 68569a0a22c18b5bd8844feee266d9da301de9cb - + https://github.com/dotnet/aspnetcore - 7069706471e7986cd769175b44f9c8010c1d9b2a + 68569a0a22c18b5bd8844feee266d9da301de9cb - + https://github.com/dotnet/aspnetcore - 7069706471e7986cd769175b44f9c8010c1d9b2a + 68569a0a22c18b5bd8844feee266d9da301de9cb https://github.com/dotnet/test-templates @@ -98,14 +98,14 @@ 4b53271e35147c45f26df629ae1530b51d574bcb - + https://github.com/dotnet/sdk - d90df99131350252c2aa2be5cd2ea28f223d183c + 52bc89eb60e2786a2918859c9f2e9c2b106e8b59 - + https://github.com/dotnet/sdk - d90df99131350252c2aa2be5cd2ea28f223d183c + 52bc89eb60e2786a2918859c9f2e9c2b106e8b59 diff --git a/eng/Versions.props b/eng/Versions.props index 5abecef8d..03c4b2b0a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,20 +44,20 @@ - 6.0.0-rtm.21473.6 - 6.0.0-rtm.21473.6 - 6.0.0-rtm.21473.6 - 6.0.0-rtm.21473.6 - 6.0.0-rtm.21473.6 - 6.0.0-rtm.21473.6 + 6.0.0-rtm.21473.21 + 6.0.0-rtm.21473.21 + 6.0.0-rtm.21473.21 + 6.0.0-rtm.21473.21 + 6.0.0-rtm.21473.21 + 6.0.0-rtm.21473.21 0.2.0 - 6.0.100-rtm.21473.37 - 6.0.100-rtm.21473.37 + 6.0.100-rtm.21473.39 + 6.0.100-rtm.21473.39 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From c1fd7c6538bf09545624aa7a4cfc6c1e24f37371 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 24 Sep 2021 01:00:52 +0000 Subject: [PATCH 030/140] Update dependencies from https://github.com/dotnet/sdk build 20210923.54 (#12111) [release/6.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.NET.Test.Sdk: from 17.0.0-release-20210921-03 to 17.0.0-release-20210923-02 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a5eb21dd8..532f99b70 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,14 +98,14 @@ 4b53271e35147c45f26df629ae1530b51d574bcb - + https://github.com/dotnet/sdk - 52bc89eb60e2786a2918859c9f2e9c2b106e8b59 + 39b999d8e97f173f3896d8e31830d584185f9b7c - + https://github.com/dotnet/sdk - 52bc89eb60e2786a2918859c9f2e9c2b106e8b59 + 39b999d8e97f173f3896d8e31830d584185f9b7c @@ -125,9 +125,9 @@ f0b5108c92b92ba5ee440228aadba3bae79b43a3 - + https://github.com/microsoft/vstest - fd2827e14e9ef99b3eb2a321fa1b8af4830b085d + 68bd10d3aee862a9fbb0bac8b3d474bc323024f3 https://github.com/mono/linker diff --git a/eng/Versions.props b/eng/Versions.props index 03c4b2b0a..6c53cda44 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.100-rtm.21473.39 - 6.0.100-rtm.21473.39 + 6.0.100-rtm.21473.54 + 6.0.100-rtm.21473.54 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -150,7 +150,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.0.0-release-20210921-03 + 17.0.0-release-20210923-02 From a28fa86af69e7c9ab9bd5422f9d1963e1a00bf60 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 24 Sep 2021 02:21:41 +0000 Subject: [PATCH 031/140] Update dependencies from https://github.com/dotnet/sdk build 20210923.61 (#12113) [release/6.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.AspNetCore.App.Ref: from 6.0.0-rtm.21473.21 to 6.0.0-rtm.21473.35 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 6.0.0-rtm.21473.21 to 6.0.0-rtm.21473.35 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.0-rtm.21473.21 to 6.0.0-rtm.21473.35 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0: from 6.0.0-rtm.21473.21 to 6.0.0-rtm.21473.35 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 6.0.0-rtm.21473.21 to 6.0.0-rtm.21473.35 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 6.0.0-rtm.21473.21 to 6.0.0-rtm.21473.35 (parent: Microsoft.NET.Sdk) --- 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 532f99b70..6ce3b0de4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -51,30 +51,30 @@ https://github.com/dotnet/runtime 491ed9a112559872c31ae40da8f6d9977ba4ce3a - + https://github.com/dotnet/aspnetcore - 68569a0a22c18b5bd8844feee266d9da301de9cb + 57b535b3a0f82954986d24550d52519212ab19fd - + https://github.com/dotnet/aspnetcore - 68569a0a22c18b5bd8844feee266d9da301de9cb + 57b535b3a0f82954986d24550d52519212ab19fd - + https://github.com/dotnet/aspnetcore - 68569a0a22c18b5bd8844feee266d9da301de9cb + 57b535b3a0f82954986d24550d52519212ab19fd - + https://github.com/dotnet/aspnetcore - 68569a0a22c18b5bd8844feee266d9da301de9cb + 57b535b3a0f82954986d24550d52519212ab19fd - + https://github.com/dotnet/aspnetcore - 68569a0a22c18b5bd8844feee266d9da301de9cb + 57b535b3a0f82954986d24550d52519212ab19fd - + https://github.com/dotnet/aspnetcore - 68569a0a22c18b5bd8844feee266d9da301de9cb + 57b535b3a0f82954986d24550d52519212ab19fd https://github.com/dotnet/test-templates @@ -98,14 +98,14 @@ 4b53271e35147c45f26df629ae1530b51d574bcb - + https://github.com/dotnet/sdk - 39b999d8e97f173f3896d8e31830d584185f9b7c + aef4c08d8f32fe09b95bd837eff311c96756a43f - + https://github.com/dotnet/sdk - 39b999d8e97f173f3896d8e31830d584185f9b7c + aef4c08d8f32fe09b95bd837eff311c96756a43f diff --git a/eng/Versions.props b/eng/Versions.props index 6c53cda44..2b243e170 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,20 +44,20 @@ - 6.0.0-rtm.21473.21 - 6.0.0-rtm.21473.21 - 6.0.0-rtm.21473.21 - 6.0.0-rtm.21473.21 - 6.0.0-rtm.21473.21 - 6.0.0-rtm.21473.21 + 6.0.0-rtm.21473.35 + 6.0.0-rtm.21473.35 + 6.0.0-rtm.21473.35 + 6.0.0-rtm.21473.35 + 6.0.0-rtm.21473.35 + 6.0.0-rtm.21473.35 0.2.0 - 6.0.100-rtm.21473.54 - 6.0.100-rtm.21473.54 + 6.0.100-rtm.21473.61 + 6.0.100-rtm.21473.61 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From c8eb33611f747a068626ae9df03934e866e792f0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 24 Sep 2021 03:57:57 +0000 Subject: [PATCH 032/140] Update dependencies from https://github.com/dotnet/sdk build 20210923.67 (#12114) [release/6.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - NuGet.Build.Tasks: from 6.0.0-rc.244 to 6.0.0-rc.258 (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 6ce3b0de4..f4ce14b09 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,14 +98,14 @@ 4b53271e35147c45f26df629ae1530b51d574bcb - + https://github.com/dotnet/sdk - aef4c08d8f32fe09b95bd837eff311c96756a43f + 7b44479284589d192577be3b7351f41c0fbc10ea - + https://github.com/dotnet/sdk - aef4c08d8f32fe09b95bd837eff311c96756a43f + 7b44479284589d192577be3b7351f41c0fbc10ea @@ -145,9 +145,9 @@ 2f1e9cad51097aec5d7268a4afdf7ad9bc6864b9 - + https://github.com/nuget/nuget.client - f4ae349ec18d1ac5d5e7d1b0ed753e1300e9e157 + e685bdb6d7b4d1f3664f6542f50b84376a19341c https://github.com/Microsoft/ApplicationInsights-dotnet diff --git a/eng/Versions.props b/eng/Versions.props index 2b243e170..1bd1ddedc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.100-rtm.21473.61 - 6.0.100-rtm.21473.61 + 6.0.100-rtm.21473.67 + 6.0.100-rtm.21473.67 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 1d47edd66c312921e2bcaf37d1179753c173d089 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 24 Sep 2021 05:10:56 +0000 Subject: [PATCH 033/140] Update dependencies from https://github.com/dotnet/sdk build 20210923.76 (#12117) [release/6.0.1xx] Update dependencies from dotnet/sdk --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f4ce14b09..92f462d4f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,14 +98,14 @@ 4b53271e35147c45f26df629ae1530b51d574bcb - + https://github.com/dotnet/sdk - 7b44479284589d192577be3b7351f41c0fbc10ea + 4b7ba951a5256b101b502b0fffa85b6b48569b7e - + https://github.com/dotnet/sdk - 7b44479284589d192577be3b7351f41c0fbc10ea + 4b7ba951a5256b101b502b0fffa85b6b48569b7e diff --git a/eng/Versions.props b/eng/Versions.props index 1bd1ddedc..6beb603fd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.100-rtm.21473.67 - 6.0.100-rtm.21473.67 + 6.0.100-rtm.21473.76 + 6.0.100-rtm.21473.76 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 441990faf646b0169472b5c6bb359a944ea20c27 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 24 Sep 2021 06:38:21 +0000 Subject: [PATCH 034/140] Update dependencies from https://github.com/dotnet/sdk build 20210923.78 (#12118) [release/6.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.AspNetCore.App.Ref: from 6.0.0-rtm.21473.35 to 6.0.0-rtm.21473.42 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 6.0.0-rtm.21473.35 to 6.0.0-rtm.21473.42 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.0-rtm.21473.35 to 6.0.0-rtm.21473.42 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0: from 6.0.0-rtm.21473.35 to 6.0.0-rtm.21473.42 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 6.0.0-rtm.21473.35 to 6.0.0-rtm.21473.42 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 6.0.0-rtm.21473.35 to 6.0.0-rtm.21473.42 (parent: Microsoft.NET.Sdk) --- 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 92f462d4f..92f2756d1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -51,30 +51,30 @@ https://github.com/dotnet/runtime 491ed9a112559872c31ae40da8f6d9977ba4ce3a - + https://github.com/dotnet/aspnetcore - 57b535b3a0f82954986d24550d52519212ab19fd + 3447aa9120d3cfe802eedae35bb7a29f3ad65762 - + https://github.com/dotnet/aspnetcore - 57b535b3a0f82954986d24550d52519212ab19fd + 3447aa9120d3cfe802eedae35bb7a29f3ad65762 - + https://github.com/dotnet/aspnetcore - 57b535b3a0f82954986d24550d52519212ab19fd + 3447aa9120d3cfe802eedae35bb7a29f3ad65762 - + https://github.com/dotnet/aspnetcore - 57b535b3a0f82954986d24550d52519212ab19fd + 3447aa9120d3cfe802eedae35bb7a29f3ad65762 - + https://github.com/dotnet/aspnetcore - 57b535b3a0f82954986d24550d52519212ab19fd + 3447aa9120d3cfe802eedae35bb7a29f3ad65762 - + https://github.com/dotnet/aspnetcore - 57b535b3a0f82954986d24550d52519212ab19fd + 3447aa9120d3cfe802eedae35bb7a29f3ad65762 https://github.com/dotnet/test-templates @@ -98,14 +98,14 @@ 4b53271e35147c45f26df629ae1530b51d574bcb - + https://github.com/dotnet/sdk - 4b7ba951a5256b101b502b0fffa85b6b48569b7e + 7156781d4c687ddf6e0f24d244c0c239a92dd02e - + https://github.com/dotnet/sdk - 4b7ba951a5256b101b502b0fffa85b6b48569b7e + 7156781d4c687ddf6e0f24d244c0c239a92dd02e diff --git a/eng/Versions.props b/eng/Versions.props index 6beb603fd..41bfa388f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,20 +44,20 @@ - 6.0.0-rtm.21473.35 - 6.0.0-rtm.21473.35 - 6.0.0-rtm.21473.35 - 6.0.0-rtm.21473.35 - 6.0.0-rtm.21473.35 - 6.0.0-rtm.21473.35 + 6.0.0-rtm.21473.42 + 6.0.0-rtm.21473.42 + 6.0.0-rtm.21473.42 + 6.0.0-rtm.21473.42 + 6.0.0-rtm.21473.42 + 6.0.0-rtm.21473.42 0.2.0 - 6.0.100-rtm.21473.76 - 6.0.100-rtm.21473.76 + 6.0.100-rtm.21473.78 + 6.0.100-rtm.21473.78 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 48724ddc99f4671f86c5e485e728a7db263dc910 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 24 Sep 2021 08:48:24 +0000 Subject: [PATCH 035/140] Update dependencies from https://github.com/dotnet/sdk build 20210924.2 (#12119) [release/6.0.1xx] Update dependencies from dotnet/sdk --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 92f2756d1..2a592824c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,14 +98,14 @@ 4b53271e35147c45f26df629ae1530b51d574bcb - + https://github.com/dotnet/sdk - 7156781d4c687ddf6e0f24d244c0c239a92dd02e + 31a2e7c7dcd8d7268a9385eb6a0285a8b5431799 - + https://github.com/dotnet/sdk - 7156781d4c687ddf6e0f24d244c0c239a92dd02e + 31a2e7c7dcd8d7268a9385eb6a0285a8b5431799 diff --git a/eng/Versions.props b/eng/Versions.props index 41bfa388f..ba1983061 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.100-rtm.21473.78 - 6.0.100-rtm.21473.78 + 6.0.100-rtm.21474.2 + 6.0.100-rtm.21474.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 48cd8a2b7fcb112f68761887756d47521c51d873 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 24 Sep 2021 14:09:55 +0000 Subject: [PATCH 036/140] Update dependencies from https://github.com/dotnet/sdk build 20210924.5 (#12122) [release/6.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.Build: from 17.0.0-preview-21471-02 to 17.0.0-preview-21474-03 (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 2a592824c..3f827550c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,14 +98,14 @@ 4b53271e35147c45f26df629ae1530b51d574bcb - + https://github.com/dotnet/sdk - 31a2e7c7dcd8d7268a9385eb6a0285a8b5431799 + cf842ada57f129658f510930da3eb5b75f43d05b - + https://github.com/dotnet/sdk - 31a2e7c7dcd8d7268a9385eb6a0285a8b5431799 + cf842ada57f129658f510930da3eb5b75f43d05b @@ -140,9 +140,9 @@ 2cb3d482e3c09760d1b204c597be93f49dba3349 - + https://github.com/dotnet/msbuild - 2f1e9cad51097aec5d7268a4afdf7ad9bc6864b9 + 9f83c725ff188ea0d68b306997328581935a7813 diff --git a/eng/Versions.props b/eng/Versions.props index ba1983061..a44716282 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.100-rtm.21474.2 - 6.0.100-rtm.21474.2 + 6.0.100-rtm.21474.5 + 6.0.100-rtm.21474.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 4460261c9d2904a3d5e230d98bcd7ecaa72ceba9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 24 Sep 2021 15:05:56 +0000 Subject: [PATCH 037/140] Update dependencies from https://github.com/dotnet/sdk build 20210924.11 (#12125) [release/6.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.AspNetCore.App.Ref: from 6.0.0-rtm.21473.42 to 6.0.0-rtm.21474.1 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 6.0.0-rtm.21473.42 to 6.0.0-rtm.21474.1 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.0-rtm.21473.42 to 6.0.0-rtm.21474.1 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0: from 6.0.0-rtm.21473.42 to 6.0.0-rtm.21474.1 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 6.0.0-rtm.21473.42 to 6.0.0-rtm.21474.1 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 6.0.0-rtm.21473.42 to 6.0.0-rtm.21474.1 (parent: Microsoft.NET.Sdk) --- 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 3f827550c..5a7131f3f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -51,30 +51,30 @@ https://github.com/dotnet/runtime 491ed9a112559872c31ae40da8f6d9977ba4ce3a - + https://github.com/dotnet/aspnetcore - 3447aa9120d3cfe802eedae35bb7a29f3ad65762 + d140c43635e320e6f87d75c72915d359684b6ceb - + https://github.com/dotnet/aspnetcore - 3447aa9120d3cfe802eedae35bb7a29f3ad65762 + d140c43635e320e6f87d75c72915d359684b6ceb - + https://github.com/dotnet/aspnetcore - 3447aa9120d3cfe802eedae35bb7a29f3ad65762 + d140c43635e320e6f87d75c72915d359684b6ceb - + https://github.com/dotnet/aspnetcore - 3447aa9120d3cfe802eedae35bb7a29f3ad65762 + d140c43635e320e6f87d75c72915d359684b6ceb - + https://github.com/dotnet/aspnetcore - 3447aa9120d3cfe802eedae35bb7a29f3ad65762 + d140c43635e320e6f87d75c72915d359684b6ceb - + https://github.com/dotnet/aspnetcore - 3447aa9120d3cfe802eedae35bb7a29f3ad65762 + d140c43635e320e6f87d75c72915d359684b6ceb https://github.com/dotnet/test-templates @@ -98,14 +98,14 @@ 4b53271e35147c45f26df629ae1530b51d574bcb - + https://github.com/dotnet/sdk - cf842ada57f129658f510930da3eb5b75f43d05b + 91466528b62683b05a394e4b9fe0c32dd99cb266 - + https://github.com/dotnet/sdk - cf842ada57f129658f510930da3eb5b75f43d05b + 91466528b62683b05a394e4b9fe0c32dd99cb266 diff --git a/eng/Versions.props b/eng/Versions.props index a44716282..71597d4a0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,20 +44,20 @@ - 6.0.0-rtm.21473.42 - 6.0.0-rtm.21473.42 - 6.0.0-rtm.21473.42 - 6.0.0-rtm.21473.42 - 6.0.0-rtm.21473.42 - 6.0.0-rtm.21473.42 + 6.0.0-rtm.21474.1 + 6.0.0-rtm.21474.1 + 6.0.0-rtm.21474.1 + 6.0.0-rtm.21474.1 + 6.0.0-rtm.21474.1 + 6.0.0-rtm.21474.1 0.2.0 - 6.0.100-rtm.21474.5 - 6.0.100-rtm.21474.5 + 6.0.100-rtm.21474.11 + 6.0.100-rtm.21474.11 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 1b0fbe53d2c7fac6b4553f3c80afeea2428a1034 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 24 Sep 2021 16:12:59 +0000 Subject: [PATCH 038/140] Update dependencies from https://github.com/dotnet/arcade build 20210923.5 (#12126) [release/6.0.1xx] Update dependencies from dotnet/arcade - Coherency Updates: - Microsoft.DotNet.XliffTasks: from 1.0.0-beta.21428.1 to 1.0.0-beta.21431.1 (parent: Microsoft.DotNet.Arcade.Sdk) --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 2 +- eng/common/cross/toolchain.cmake | 4 ++-- eng/common/tools.ps1 | 21 +++++++++++++++++++++ eng/common/tools.sh | 9 +++++++++ global.json | 4 ++-- 6 files changed, 43 insertions(+), 13 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5a7131f3f..210c12a2a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -169,19 +169,19 @@ - + https://github.com/dotnet/arcade - 761d2e6545a31d2ebf9cb60443ed2a9c2f8268b5 + c575da80f465e0b5fb98f416be92bb98b2f54b41 - + https://github.com/dotnet/arcade - 761d2e6545a31d2ebf9cb60443ed2a9c2f8268b5 + c575da80f465e0b5fb98f416be92bb98b2f54b41 - + https://github.com/dotnet/arcade - 761d2e6545a31d2ebf9cb60443ed2a9c2f8268b5 + c575da80f465e0b5fb98f416be92bb98b2f54b41 https://github.com/dotnet/source-build-reference-packages @@ -192,9 +192,9 @@ 6dcc7d005e38829efb6714d2ecfc4c0cb383e7d9 - + https://github.com/dotnet/xliff-tasks - 178ed3c7ed19e5bda54a8c3f15a5c441ee63ab93 + bc3233146e1fcd393ed471d5005333c83363e0fe diff --git a/eng/Versions.props b/eng/Versions.props index 71597d4a0..1b06183df 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,7 +19,7 @@ - 6.0.0-beta.21431.1 + 6.0.0-beta.21473.5 diff --git a/eng/common/cross/toolchain.cmake b/eng/common/cross/toolchain.cmake index fc11001aa..ec8971eb0 100644 --- a/eng/common/cross/toolchain.cmake +++ b/eng/common/cross/toolchain.cmake @@ -138,8 +138,8 @@ function(add_toolchain_linker_flag Flag) if (NOT Config STREQUAL "") set(CONFIG_SUFFIX "_${Config}") endif() - set("CMAKE_EXE_LINKER_FLAGS${CONFIG_SUFFIX}" "${CMAKE_EXE_LINKER_FLAGS${CONFIG_SUFFIX}} ${Flag}" PARENT_SCOPE) - set("CMAKE_SHARED_LINKER_FLAGS${CONFIG_SUFFIX}" "${CMAKE_SHARED_LINKER_FLAGS${CONFIG_SUFFIX}} ${Flag}" PARENT_SCOPE) + set("CMAKE_EXE_LINKER_FLAGS${CONFIG_SUFFIX}_INIT" "${CMAKE_EXE_LINKER_FLAGS${CONFIG_SUFFIX}_INIT} ${Flag}" PARENT_SCOPE) + set("CMAKE_SHARED_LINKER_FLAGS${CONFIG_SUFFIX}_INIT" "${CMAKE_SHARED_LINKER_FLAGS${CONFIG_SUFFIX}_INIT} ${Flag}" PARENT_SCOPE) endfunction() if(CMAKE_SYSTEM_NAME STREQUAL "Linux") diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 56ee4a577..444842899 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -709,6 +709,8 @@ function MSBuild() { Write-PipelineSetVariable -Name 'NUGET_PLUGIN_REQUEST_TIMEOUT_IN_SECONDS' -Value '20' } + Enable-Nuget-EnhancedRetry + $toolsetBuildProject = InitializeToolset $basePath = Split-Path -parent $toolsetBuildProject $possiblePaths = @( @@ -717,6 +719,8 @@ function MSBuild() { (Join-Path $basePath (Join-Path $buildTool.Framework 'Microsoft.DotNet.Arcade.Sdk.dll')), (Join-Path $basePath (Join-Path netcoreapp2.1 'Microsoft.DotNet.ArcadeLogging.dll')), (Join-Path $basePath (Join-Path netcoreapp2.1 'Microsoft.DotNet.Arcade.Sdk.dll')) + (Join-Path $basePath (Join-Path netcoreapp3.1 'Microsoft.DotNet.ArcadeLogging.dll')), + (Join-Path $basePath (Join-Path netcoreapp3.1 'Microsoft.DotNet.Arcade.Sdk.dll')) ) $selectedPath = $null foreach ($path in $possiblePaths) { @@ -753,6 +757,8 @@ function MSBuild-Core() { } } + Enable-Nuget-EnhancedRetry + $buildTool = InitializeBuildTool $cmdArgs = "$($buildTool.Command) /m /nologo /clp:Summary /v:$verbosity /nr:$nodeReuse /p:ContinuousIntegrationBuild=$ci" @@ -893,3 +899,18 @@ function Try-LogClientIpAddress() Write-Host "Unable to get this machine's effective IP address for logging: $_" } } + +# +# If $ci flag is set, turn on (and log that we did) special environment variables for improved Nuget client retry logic. +# +function Enable-Nuget-EnhancedRetry() { + if ($ci) { + Write-Host "Setting NUGET enhanced retry environment variables" + $env:NUGET_ENABLE_EXPERIMENTAL_HTTP_RETRY = 'true' + $env:NUGET_EXPERIMENTAL_MAX_NETWORK_TRY_COUNT = 6 + $env:NUGET_EXPERIMENTAL_NETWORK_RETRY_DELAY_MILLISECONDS = 1000 + Write-PipelineSetVariable -Name 'NUGET_ENABLE_EXPERIMENTAL_HTTP_RETRY' -Value 'true' + Write-PipelineSetVariable -Name 'NUGET_EXPERIMENTAL_MAX_NETWORK_TRY_COUNT' -Value '6' + Write-PipelineSetVariable -Name 'NUGET_EXPERIMENTAL_NETWORK_RETRY_DELAY_MILLISECONDS' -Value '1000' + } +} diff --git a/eng/common/tools.sh b/eng/common/tools.sh index 41e323104..6a4871ef7 100755 --- a/eng/common/tools.sh +++ b/eng/common/tools.sh @@ -417,6 +417,13 @@ function MSBuild { export NUGET_PLUGIN_REQUEST_TIMEOUT_IN_SECONDS=20 Write-PipelineSetVariable -name "NUGET_PLUGIN_HANDSHAKE_TIMEOUT_IN_SECONDS" -value "20" Write-PipelineSetVariable -name "NUGET_PLUGIN_REQUEST_TIMEOUT_IN_SECONDS" -value "20" + + export NUGET_ENABLE_EXPERIMENTAL_HTTP_RETRY=true + export NUGET_EXPERIMENTAL_MAX_NETWORK_TRY_COUNT=6 + export NUGET_EXPERIMENTAL_NETWORK_RETRY_DELAY_MILLISECONDS=1000 + Write-PipelineSetVariable -name "NUGET_ENABLE_EXPERIMENTAL_HTTP_RETRY" -value "true" + Write-PipelineSetVariable -name "NUGET_EXPERIMENTAL_MAX_NETWORK_TRY_COUNT" -value "6" + Write-PipelineSetVariable -name "NUGET_EXPERIMENTAL_NETWORK_RETRY_DELAY_MILLISECONDS" -value "1000" fi local toolset_dir="${_InitializeToolset%/*}" @@ -427,6 +434,8 @@ function MSBuild { possiblePaths+=( "$toolset_dir/$_InitializeBuildToolFramework/Microsoft.DotNet.Arcade.Sdk.dll" ) possiblePaths+=( "$toolset_dir/netcoreapp2.1/Microsoft.DotNet.ArcadeLogging.dll" ) possiblePaths+=( "$toolset_dir/netcoreapp2.1/Microsoft.DotNet.Arcade.Sdk.dll" ) + possiblePaths+=( "$toolset_dir/netcoreapp3.1/Microsoft.DotNet.ArcadeLogging.dll" ) + possiblePaths+=( "$toolset_dir/netcoreapp3.1/Microsoft.DotNet.Arcade.Sdk.dll" ) for path in "${possiblePaths[@]}"; do if [[ -f $path ]]; then selectedPath=$path diff --git a/global.json b/global.json index 3995e3620..745453058 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21431.1", - "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.21431.1" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21473.5", + "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.21473.5" } } From 18922d9929d55cd84a74853d94cf1cf8cb2458df Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 24 Sep 2021 20:00:51 +0000 Subject: [PATCH 039/140] Update dependencies from https://github.com/dotnet/sdk build 20210924.26 (#12130) [release/6.0.1xx] Update dependencies from dotnet/sdk --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 210c12a2a..22fdf853c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,14 +98,14 @@ 4b53271e35147c45f26df629ae1530b51d574bcb - + https://github.com/dotnet/sdk - 91466528b62683b05a394e4b9fe0c32dd99cb266 + a939058b6428d9a1befbf280163cd3978aa8470e - + https://github.com/dotnet/sdk - 91466528b62683b05a394e4b9fe0c32dd99cb266 + a939058b6428d9a1befbf280163cd3978aa8470e diff --git a/eng/Versions.props b/eng/Versions.props index 1b06183df..194eeda3c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.100-rtm.21474.11 - 6.0.100-rtm.21474.11 + 6.0.100-rtm.21474.26 + 6.0.100-rtm.21474.26 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 88306d4ccb69c32bd7a61e92c17febfd4c79341e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 24 Sep 2021 22:24:56 +0000 Subject: [PATCH 040/140] [release/6.0.1xx] Update dependencies from dotnet/sdk (#12132) [release/6.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.WindowsDesktop.App.Ref: from 6.0.0-rtm.21472.12 to 6.0.0-rtm.21474.11 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0: from 6.0.0-rtm.21472.12 to 6.0.0-rtm.21474.11 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0: from 6.0.0-rtm.21472.12 to 6.0.0-rtm.21474.11 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref: from 6.0.0-rtm.21474.1 to 6.0.0-rtm.21474.12 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 6.0.0-rtm.21474.1 to 6.0.0-rtm.21474.12 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.0-rtm.21474.1 to 6.0.0-rtm.21474.12 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0: from 6.0.0-rtm.21474.1 to 6.0.0-rtm.21474.12 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 6.0.0-rtm.21474.1 to 6.0.0-rtm.21474.12 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 6.0.0-rtm.21474.1 to 6.0.0-rtm.21474.12 (parent: Microsoft.NET.Sdk) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.0-rtm.21472.12 to 6.0.0-rtm.21474.11 (parent: Microsoft.NET.Sdk) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.0-rtm.21472.12 to 6.0.0-rtm.21474.11 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Wpf.ProjectTemplates: from 6.0.0-rtm.21472.12 to 6.0.0-rtm.21474.7 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.NET.ILLink.Tasks: from 6.0.100-1.21459.1 to 6.0.100-1.21473.1 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 58 ++++++++++++++++++++--------------------- eng/Versions.props | 26 +++++++++--------- 2 files changed, 42 insertions(+), 42 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 22fdf853c..a34bb6e17 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,21 +1,21 @@ - + https://github.com/dotnet/windowsdesktop - 49a6068987c8bd70bbe520e4a5866d92f8c3b1f4 + 4d91fdeb3a2743f856e34bd51db10a4d45ade088 - + https://github.com/dotnet/windowsdesktop - 49a6068987c8bd70bbe520e4a5866d92f8c3b1f4 + 4d91fdeb3a2743f856e34bd51db10a4d45ade088 - + https://github.com/dotnet/windowsdesktop - 49a6068987c8bd70bbe520e4a5866d92f8c3b1f4 + 4d91fdeb3a2743f856e34bd51db10a4d45ade088 - + https://github.com/dotnet/windowsdesktop - 49a6068987c8bd70bbe520e4a5866d92f8c3b1f4 + 4d91fdeb3a2743f856e34bd51db10a4d45ade088 https://github.com/dotnet/runtime @@ -51,30 +51,30 @@ https://github.com/dotnet/runtime 491ed9a112559872c31ae40da8f6d9977ba4ce3a - + https://github.com/dotnet/aspnetcore - d140c43635e320e6f87d75c72915d359684b6ceb + 1d14c7115f7cde0d71e87470862c5782188ad462 - + https://github.com/dotnet/aspnetcore - d140c43635e320e6f87d75c72915d359684b6ceb + 1d14c7115f7cde0d71e87470862c5782188ad462 - + https://github.com/dotnet/aspnetcore - d140c43635e320e6f87d75c72915d359684b6ceb + 1d14c7115f7cde0d71e87470862c5782188ad462 - + https://github.com/dotnet/aspnetcore - d140c43635e320e6f87d75c72915d359684b6ceb + 1d14c7115f7cde0d71e87470862c5782188ad462 - + https://github.com/dotnet/aspnetcore - d140c43635e320e6f87d75c72915d359684b6ceb + 1d14c7115f7cde0d71e87470862c5782188ad462 - + https://github.com/dotnet/aspnetcore - d140c43635e320e6f87d75c72915d359684b6ceb + 1d14c7115f7cde0d71e87470862c5782188ad462 https://github.com/dotnet/test-templates @@ -98,23 +98,23 @@ 4b53271e35147c45f26df629ae1530b51d574bcb - + https://github.com/dotnet/sdk - a939058b6428d9a1befbf280163cd3978aa8470e + 35901a1cb5dad9fbc9d1a4dc4144fe44ed3e9d86 - + https://github.com/dotnet/sdk - a939058b6428d9a1befbf280163cd3978aa8470e + 35901a1cb5dad9fbc9d1a4dc4144fe44ed3e9d86 https://github.com/dotnet/winforms 406fc6353f173c3f4a95645405b8df058203a9ae - + https://github.com/dotnet/wpf - 0b49b900f50f8793c29c08b55b8bbf6fd45f652f + a2757462991b736d8e17a9a81d35e00d16c69133 https://github.com/dotnet/fsharp @@ -129,9 +129,9 @@ https://github.com/microsoft/vstest 68bd10d3aee862a9fbb0bac8b3d474bc323024f3 - - https://github.com/mono/linker - c8499798a2a09639174e2f5c694d6652794cc73d + + https://github.com/dotnet/linker + d51cc207fac85547787bbba83f54f69d8e72e9f5 linker diff --git a/eng/Versions.props b/eng/Versions.props index 194eeda3c..25a932dc8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -27,7 +27,7 @@ - 6.0.0-rtm.21472.12 + 6.0.0-rtm.21474.7 @@ -44,20 +44,20 @@ - 6.0.0-rtm.21474.1 - 6.0.0-rtm.21474.1 - 6.0.0-rtm.21474.1 - 6.0.0-rtm.21474.1 - 6.0.0-rtm.21474.1 - 6.0.0-rtm.21474.1 + 6.0.0-rtm.21474.12 + 6.0.0-rtm.21474.12 + 6.0.0-rtm.21474.12 + 6.0.0-rtm.21474.12 + 6.0.0-rtm.21474.12 + 6.0.0-rtm.21474.12 0.2.0 - 6.0.100-rtm.21474.26 - 6.0.100-rtm.21474.26 + 6.0.100-rtm.21474.46 + 6.0.100-rtm.21474.46 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,10 +78,10 @@ - 6.0.0-rtm.21472.12 - 6.0.0-rtm.21472.12 - 6.0.0-rtm.21472.12 - 6.0.0-rtm.21472.12 + 6.0.0-rtm.21474.11 + 6.0.0-rtm.21474.11 + 6.0.0-rtm.21474.11 + 6.0.0-rtm.21474.11 From 5196e03d4f34bab8b74cf0e547ad38bcb293e93a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 25 Sep 2021 03:25:38 +0000 Subject: [PATCH 041/140] Update dependencies from https://github.com/dotnet/sdk build 20210924.60 (#12135) [release/6.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.WindowsDesktop.App.Ref: from 6.0.0-rtm.21474.11 to 6.0.0-rtm.21474.22 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0: from 6.0.0-rtm.21474.11 to 6.0.0-rtm.21474.22 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0: from 6.0.0-rtm.21474.11 to 6.0.0-rtm.21474.22 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref: from 6.0.0-rtm.21474.12 to 6.0.0-rtm.21474.36 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 6.0.0-rtm.21474.12 to 6.0.0-rtm.21474.36 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.0-rtm.21474.12 to 6.0.0-rtm.21474.36 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0: from 6.0.0-rtm.21474.12 to 6.0.0-rtm.21474.36 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 6.0.0-rtm.21474.12 to 6.0.0-rtm.21474.36 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 6.0.0-rtm.21474.12 to 6.0.0-rtm.21474.36 (parent: Microsoft.NET.Sdk) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.0-rtm.21474.11 to 6.0.0-rtm.21474.22 (parent: Microsoft.NET.Sdk) - Microsoft.Dotnet.WinForms.ProjectTemplates: from 6.0.0-rtm.21472.8 to 6.0.0-rtm.21474.11 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.0-rtm.21474.11 to 6.0.0-rtm.21474.22 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Wpf.ProjectTemplates: from 6.0.0-rtm.21474.7 to 6.0.0-rtm.21474.16 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) --- eng/Version.Details.xml | 56 ++++++++++++++++++++--------------------- eng/Versions.props | 28 ++++++++++----------- 2 files changed, 42 insertions(+), 42 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a34bb6e17..e2f695067 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,21 +1,21 @@ - + https://github.com/dotnet/windowsdesktop - 4d91fdeb3a2743f856e34bd51db10a4d45ade088 + f906081f4b487b7f4b8156598c3d7066a7ac1889 - + https://github.com/dotnet/windowsdesktop - 4d91fdeb3a2743f856e34bd51db10a4d45ade088 + f906081f4b487b7f4b8156598c3d7066a7ac1889 - + https://github.com/dotnet/windowsdesktop - 4d91fdeb3a2743f856e34bd51db10a4d45ade088 + f906081f4b487b7f4b8156598c3d7066a7ac1889 - + https://github.com/dotnet/windowsdesktop - 4d91fdeb3a2743f856e34bd51db10a4d45ade088 + f906081f4b487b7f4b8156598c3d7066a7ac1889 https://github.com/dotnet/runtime @@ -51,30 +51,30 @@ https://github.com/dotnet/runtime 491ed9a112559872c31ae40da8f6d9977ba4ce3a - + https://github.com/dotnet/aspnetcore - 1d14c7115f7cde0d71e87470862c5782188ad462 + 013df57e31954e50c9d8a9d6af68abfe8d80f479 - + https://github.com/dotnet/aspnetcore - 1d14c7115f7cde0d71e87470862c5782188ad462 + 013df57e31954e50c9d8a9d6af68abfe8d80f479 - + https://github.com/dotnet/aspnetcore - 1d14c7115f7cde0d71e87470862c5782188ad462 + 013df57e31954e50c9d8a9d6af68abfe8d80f479 - + https://github.com/dotnet/aspnetcore - 1d14c7115f7cde0d71e87470862c5782188ad462 + 013df57e31954e50c9d8a9d6af68abfe8d80f479 - + https://github.com/dotnet/aspnetcore - 1d14c7115f7cde0d71e87470862c5782188ad462 + 013df57e31954e50c9d8a9d6af68abfe8d80f479 - + https://github.com/dotnet/aspnetcore - 1d14c7115f7cde0d71e87470862c5782188ad462 + 013df57e31954e50c9d8a9d6af68abfe8d80f479 https://github.com/dotnet/test-templates @@ -98,23 +98,23 @@ 4b53271e35147c45f26df629ae1530b51d574bcb - + https://github.com/dotnet/sdk - 35901a1cb5dad9fbc9d1a4dc4144fe44ed3e9d86 + 8f2913375052856df6c33784eaaa5c13fe8aa25d - + https://github.com/dotnet/sdk - 35901a1cb5dad9fbc9d1a4dc4144fe44ed3e9d86 + 8f2913375052856df6c33784eaaa5c13fe8aa25d - + https://github.com/dotnet/winforms - 406fc6353f173c3f4a95645405b8df058203a9ae + 5feaec7582d2c99555ede1164500fef8e6c8240c - + https://github.com/dotnet/wpf - a2757462991b736d8e17a9a81d35e00d16c69133 + 28f78e4280c6b340d4819f11d96c9f1ecea9883f https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 25a932dc8..6bbfd9b43 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.0-rtm.21472.8 + 6.0.0-rtm.21474.11 - 6.0.0-rtm.21474.7 + 6.0.0-rtm.21474.16 @@ -44,20 +44,20 @@ - 6.0.0-rtm.21474.12 - 6.0.0-rtm.21474.12 - 6.0.0-rtm.21474.12 - 6.0.0-rtm.21474.12 - 6.0.0-rtm.21474.12 - 6.0.0-rtm.21474.12 + 6.0.0-rtm.21474.36 + 6.0.0-rtm.21474.36 + 6.0.0-rtm.21474.36 + 6.0.0-rtm.21474.36 + 6.0.0-rtm.21474.36 + 6.0.0-rtm.21474.36 0.2.0 - 6.0.100-rtm.21474.46 - 6.0.100-rtm.21474.46 + 6.0.100-rtm.21474.60 + 6.0.100-rtm.21474.60 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,10 +78,10 @@ - 6.0.0-rtm.21474.11 - 6.0.0-rtm.21474.11 - 6.0.0-rtm.21474.11 - 6.0.0-rtm.21474.11 + 6.0.0-rtm.21474.22 + 6.0.0-rtm.21474.22 + 6.0.0-rtm.21474.22 + 6.0.0-rtm.21474.22 From 4d492081ed235bd0210ffb75008c90b5e51411e4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 25 Sep 2021 04:15:04 +0000 Subject: [PATCH 042/140] Update dependencies from https://github.com/dotnet/sdk build 20210924.65 (#12136) [release/6.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.WindowsDesktop.App.Ref: from 6.0.0-rtm.21474.22 to 6.0.0-rtm.21474.23 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0: from 6.0.0-rtm.21474.22 to 6.0.0-rtm.21474.23 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0: from 6.0.0-rtm.21474.22 to 6.0.0-rtm.21474.23 (parent: Microsoft.NET.Sdk) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.0-rtm.21474.22 to 6.0.0-rtm.21474.23 (parent: Microsoft.NET.Sdk) - Microsoft.Dotnet.WinForms.ProjectTemplates: from 6.0.0-rtm.21474.11 to 6.0.0-rtm.21474.14 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.0-rtm.21474.22 to 6.0.0-rtm.21474.23 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Wpf.ProjectTemplates: from 6.0.0-rtm.21474.16 to 6.0.0-rtm.21474.20 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) --- 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 e2f695067..45107c760 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,21 +1,21 @@ - + https://github.com/dotnet/windowsdesktop - f906081f4b487b7f4b8156598c3d7066a7ac1889 + b03517b10a755777a9133057e2fa0f97796b5a23 - + https://github.com/dotnet/windowsdesktop - f906081f4b487b7f4b8156598c3d7066a7ac1889 + b03517b10a755777a9133057e2fa0f97796b5a23 - + https://github.com/dotnet/windowsdesktop - f906081f4b487b7f4b8156598c3d7066a7ac1889 + b03517b10a755777a9133057e2fa0f97796b5a23 - + https://github.com/dotnet/windowsdesktop - f906081f4b487b7f4b8156598c3d7066a7ac1889 + b03517b10a755777a9133057e2fa0f97796b5a23 https://github.com/dotnet/runtime @@ -98,23 +98,23 @@ 4b53271e35147c45f26df629ae1530b51d574bcb - + https://github.com/dotnet/sdk - 8f2913375052856df6c33784eaaa5c13fe8aa25d + 3cfb7c803f94692f53380e9d2b60f162ec43c34a - + https://github.com/dotnet/sdk - 8f2913375052856df6c33784eaaa5c13fe8aa25d + 3cfb7c803f94692f53380e9d2b60f162ec43c34a - + https://github.com/dotnet/winforms - 5feaec7582d2c99555ede1164500fef8e6c8240c + 48fac652bc0ebcf2526d19a9b238b0e4fe287170 - + https://github.com/dotnet/wpf - 28f78e4280c6b340d4819f11d96c9f1ecea9883f + c5eab0a86ae720ca4d08cf51c97e4648ad008f8c https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 6bbfd9b43..cce5d2367 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.0-rtm.21474.11 + 6.0.0-rtm.21474.14 - 6.0.0-rtm.21474.16 + 6.0.0-rtm.21474.20 @@ -56,8 +56,8 @@ - 6.0.100-rtm.21474.60 - 6.0.100-rtm.21474.60 + 6.0.100-rtm.21474.65 + 6.0.100-rtm.21474.65 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,10 +78,10 @@ - 6.0.0-rtm.21474.22 - 6.0.0-rtm.21474.22 - 6.0.0-rtm.21474.22 - 6.0.0-rtm.21474.22 + 6.0.0-rtm.21474.23 + 6.0.0-rtm.21474.23 + 6.0.0-rtm.21474.23 + 6.0.0-rtm.21474.23 From 15913f9a994602eab06f95d7465b0ea15f1bdee7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 25 Sep 2021 08:39:10 +0000 Subject: [PATCH 043/140] Update dependencies from https://github.com/dotnet/sdk build 20210924.70 (#12137) [release/6.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.AspNetCore.App.Ref: from 6.0.0-rtm.21474.36 to 6.0.0-rtm.21474.41 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 6.0.0-rtm.21474.36 to 6.0.0-rtm.21474.41 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.0-rtm.21474.36 to 6.0.0-rtm.21474.41 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0: from 6.0.0-rtm.21474.36 to 6.0.0-rtm.21474.41 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 6.0.0-rtm.21474.36 to 6.0.0-rtm.21474.41 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 6.0.0-rtm.21474.36 to 6.0.0-rtm.21474.41 (parent: Microsoft.NET.Sdk) --- 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 45107c760..ccb6c0136 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -51,30 +51,30 @@ https://github.com/dotnet/runtime 491ed9a112559872c31ae40da8f6d9977ba4ce3a - + https://github.com/dotnet/aspnetcore - 013df57e31954e50c9d8a9d6af68abfe8d80f479 + 20b820fef5c10692cc2afe48d7c57567135f17f0 - + https://github.com/dotnet/aspnetcore - 013df57e31954e50c9d8a9d6af68abfe8d80f479 + 20b820fef5c10692cc2afe48d7c57567135f17f0 - + https://github.com/dotnet/aspnetcore - 013df57e31954e50c9d8a9d6af68abfe8d80f479 + 20b820fef5c10692cc2afe48d7c57567135f17f0 - + https://github.com/dotnet/aspnetcore - 013df57e31954e50c9d8a9d6af68abfe8d80f479 + 20b820fef5c10692cc2afe48d7c57567135f17f0 - + https://github.com/dotnet/aspnetcore - 013df57e31954e50c9d8a9d6af68abfe8d80f479 + 20b820fef5c10692cc2afe48d7c57567135f17f0 - + https://github.com/dotnet/aspnetcore - 013df57e31954e50c9d8a9d6af68abfe8d80f479 + 20b820fef5c10692cc2afe48d7c57567135f17f0 https://github.com/dotnet/test-templates @@ -98,14 +98,14 @@ 4b53271e35147c45f26df629ae1530b51d574bcb - + https://github.com/dotnet/sdk - 3cfb7c803f94692f53380e9d2b60f162ec43c34a + a9839e4bc6e957c5f73d0caa21e3bb0a7889a45c - + https://github.com/dotnet/sdk - 3cfb7c803f94692f53380e9d2b60f162ec43c34a + a9839e4bc6e957c5f73d0caa21e3bb0a7889a45c diff --git a/eng/Versions.props b/eng/Versions.props index cce5d2367..ba56de26d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,20 +44,20 @@ - 6.0.0-rtm.21474.36 - 6.0.0-rtm.21474.36 - 6.0.0-rtm.21474.36 - 6.0.0-rtm.21474.36 - 6.0.0-rtm.21474.36 - 6.0.0-rtm.21474.36 + 6.0.0-rtm.21474.41 + 6.0.0-rtm.21474.41 + 6.0.0-rtm.21474.41 + 6.0.0-rtm.21474.41 + 6.0.0-rtm.21474.41 + 6.0.0-rtm.21474.41 0.2.0 - 6.0.100-rtm.21474.65 - 6.0.100-rtm.21474.65 + 6.0.100-rtm.21474.70 + 6.0.100-rtm.21474.70 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 0045dc0b47a74c0c1041989a61062ae63e47d183 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 26 Sep 2021 02:06:24 +0000 Subject: [PATCH 044/140] Update dependencies from https://github.com/dotnet/sdk build 20210925.11 (#12139) [release/6.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.AspNetCore.App.Ref: from 6.0.0-rtm.21474.41 to 6.0.0-rtm.21475.9 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 6.0.0-rtm.21474.41 to 6.0.0-rtm.21475.9 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.0-rtm.21474.41 to 6.0.0-rtm.21475.9 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0: from 6.0.0-rtm.21474.41 to 6.0.0-rtm.21475.9 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 6.0.0-rtm.21474.41 to 6.0.0-rtm.21475.9 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 6.0.0-rtm.21474.41 to 6.0.0-rtm.21475.9 (parent: Microsoft.NET.Sdk) --- 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 ccb6c0136..649bc36c3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -51,30 +51,30 @@ https://github.com/dotnet/runtime 491ed9a112559872c31ae40da8f6d9977ba4ce3a - + https://github.com/dotnet/aspnetcore - 20b820fef5c10692cc2afe48d7c57567135f17f0 + e66cee96d2d5cb024f80c8c1a976dc80ba791cf6 - + https://github.com/dotnet/aspnetcore - 20b820fef5c10692cc2afe48d7c57567135f17f0 + e66cee96d2d5cb024f80c8c1a976dc80ba791cf6 - + https://github.com/dotnet/aspnetcore - 20b820fef5c10692cc2afe48d7c57567135f17f0 + e66cee96d2d5cb024f80c8c1a976dc80ba791cf6 - + https://github.com/dotnet/aspnetcore - 20b820fef5c10692cc2afe48d7c57567135f17f0 + e66cee96d2d5cb024f80c8c1a976dc80ba791cf6 - + https://github.com/dotnet/aspnetcore - 20b820fef5c10692cc2afe48d7c57567135f17f0 + e66cee96d2d5cb024f80c8c1a976dc80ba791cf6 - + https://github.com/dotnet/aspnetcore - 20b820fef5c10692cc2afe48d7c57567135f17f0 + e66cee96d2d5cb024f80c8c1a976dc80ba791cf6 https://github.com/dotnet/test-templates @@ -98,14 +98,14 @@ 4b53271e35147c45f26df629ae1530b51d574bcb - + https://github.com/dotnet/sdk - a9839e4bc6e957c5f73d0caa21e3bb0a7889a45c + 10890df5098158bef5dd09a43c499b8b0f83bdbd - + https://github.com/dotnet/sdk - a9839e4bc6e957c5f73d0caa21e3bb0a7889a45c + 10890df5098158bef5dd09a43c499b8b0f83bdbd diff --git a/eng/Versions.props b/eng/Versions.props index ba56de26d..4b2f1c08c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,20 +44,20 @@ - 6.0.0-rtm.21474.41 - 6.0.0-rtm.21474.41 - 6.0.0-rtm.21474.41 - 6.0.0-rtm.21474.41 - 6.0.0-rtm.21474.41 - 6.0.0-rtm.21474.41 + 6.0.0-rtm.21475.9 + 6.0.0-rtm.21475.9 + 6.0.0-rtm.21475.9 + 6.0.0-rtm.21475.9 + 6.0.0-rtm.21475.9 + 6.0.0-rtm.21475.9 0.2.0 - 6.0.100-rtm.21474.70 - 6.0.100-rtm.21474.70 + 6.0.100-rtm.21475.11 + 6.0.100-rtm.21475.11 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 885ff3819901e75ee1782185a53a3ab4ea6deac8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 26 Sep 2021 07:34:21 +0000 Subject: [PATCH 045/140] Update dependencies from https://github.com/dotnet/sdk build 20210925.16 (#12140) [release/6.0.1xx] Update dependencies from dotnet/sdk --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 649bc36c3..58b79386f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,14 +98,14 @@ 4b53271e35147c45f26df629ae1530b51d574bcb - + https://github.com/dotnet/sdk - 10890df5098158bef5dd09a43c499b8b0f83bdbd + 102b657d01a29eeee28b307471000df2813b9e0a - + https://github.com/dotnet/sdk - 10890df5098158bef5dd09a43c499b8b0f83bdbd + 102b657d01a29eeee28b307471000df2813b9e0a diff --git a/eng/Versions.props b/eng/Versions.props index 4b2f1c08c..3ffc8d540 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.100-rtm.21475.11 - 6.0.100-rtm.21475.11 + 6.0.100-rtm.21475.16 + 6.0.100-rtm.21475.16 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From a6385f7be2edfb8654b592c28349d3b25480adad Mon Sep 17 00:00:00 2001 From: Eric StJohn Date: Wed, 22 Sep 2021 15:03:44 -0700 Subject: [PATCH 046/140] Remove writing InstallLocation from SDK, it will be handled by host --- .../packaging/windows/clisdk/bundle.wxs | 3 --- .../packaging/windows/clisdk/registrykeys.wxs | 18 ------------------ 2 files changed, 21 deletions(-) diff --git a/src/redist/targets/packaging/windows/clisdk/bundle.wxs b/src/redist/targets/packaging/windows/clisdk/bundle.wxs index b433f6444..7063e6c64 100644 --- a/src/redist/targets/packaging/windows/clisdk/bundle.wxs +++ b/src/redist/targets/packaging/windows/clisdk/bundle.wxs @@ -181,9 +181,6 @@ - - - diff --git a/src/redist/targets/packaging/windows/clisdk/registrykeys.wxs b/src/redist/targets/packaging/windows/clisdk/registrykeys.wxs index a84391c81..f47cfca05 100644 --- a/src/redist/targets/packaging/windows/clisdk/registrykeys.wxs +++ b/src/redist/targets/packaging/windows/clisdk/registrykeys.wxs @@ -15,24 +15,6 @@ - - VersionNT64 AND DOTNETHOME_ARM64 - - - - - - VersionNT64 AND DOTNETHOME_X64 - - - - - - DOTNETHOME_X86 - - - - From 8f1aeef69446a0b914b68842565e845382bfdadc Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 27 Sep 2021 19:16:47 +0000 Subject: [PATCH 047/140] Update dependencies from https://github.com/dotnet/sdk build 20210927.4 (#12144) [release/6.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.Build: from 17.0.0-preview-21474-03 to 17.0.0-preview-21477-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 58b79386f..0a6dca576 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,14 +98,14 @@ 4b53271e35147c45f26df629ae1530b51d574bcb - + https://github.com/dotnet/sdk - 102b657d01a29eeee28b307471000df2813b9e0a + 2df7d85dbf85b27b1789c8135660df4c89a120a5 - + https://github.com/dotnet/sdk - 102b657d01a29eeee28b307471000df2813b9e0a + 2df7d85dbf85b27b1789c8135660df4c89a120a5 @@ -140,9 +140,9 @@ 2cb3d482e3c09760d1b204c597be93f49dba3349 - + https://github.com/dotnet/msbuild - 9f83c725ff188ea0d68b306997328581935a7813 + c144bfc4693abfd02803fbb8cd223c7b314b9ab3 diff --git a/eng/Versions.props b/eng/Versions.props index 3ffc8d540..4de264216 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.100-rtm.21475.16 - 6.0.100-rtm.21475.16 + 6.0.100-rtm.21477.4 + 6.0.100-rtm.21477.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From a3a35ac71d6de7e205dafc83e3e47d4a6e2be803 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 27 Sep 2021 22:32:57 +0000 Subject: [PATCH 048/140] [release/6.0.1xx] Update dependencies from dotnet/sdk (#12145) [release/6.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.Build: from 17.0.0-preview-21477-01 to 17.0.0-preview-21477-03 (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 0a6dca576..45edabe02 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,14 +98,14 @@ 4b53271e35147c45f26df629ae1530b51d574bcb - + https://github.com/dotnet/sdk - 2df7d85dbf85b27b1789c8135660df4c89a120a5 + 4a26194d6b114a9cf0b7cd965200af92d5d6863c - + https://github.com/dotnet/sdk - 2df7d85dbf85b27b1789c8135660df4c89a120a5 + 4a26194d6b114a9cf0b7cd965200af92d5d6863c @@ -140,9 +140,9 @@ 2cb3d482e3c09760d1b204c597be93f49dba3349 - + https://github.com/dotnet/msbuild - c144bfc4693abfd02803fbb8cd223c7b314b9ab3 + e123a0c1fb4a66a3fdcfbe8a8792183f7df5cc34 diff --git a/eng/Versions.props b/eng/Versions.props index 4de264216..160ad4b6f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.100-rtm.21477.4 - 6.0.100-rtm.21477.4 + 6.0.100-rtm.21477.16 + 6.0.100-rtm.21477.16 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From c9465a5abd03ba1422f0bc39b763f410b2524375 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 27 Sep 2021 23:18:17 +0000 Subject: [PATCH 049/140] Update dependencies from https://github.com/dotnet/sdk build 20210927.23 (#12146) [release/6.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.FSharp.Compiler: from 12.0.0-beta.21472.3 to 12.0.0-beta.21477.4 (parent: Microsoft.NET.Sdk) - Microsoft.SourceBuild.Intermediate.fsharp: from 6.0.0-beta.21472.3 to 6.0.0-beta.21477.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 45edabe02..3d64849b5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,14 +98,14 @@ 4b53271e35147c45f26df629ae1530b51d574bcb - + https://github.com/dotnet/sdk - 4a26194d6b114a9cf0b7cd965200af92d5d6863c + 500db9383936024e9e6cc37ec64ba99c59b501c4 - + https://github.com/dotnet/sdk - 4a26194d6b114a9cf0b7cd965200af92d5d6863c + 500db9383936024e9e6cc37ec64ba99c59b501c4 @@ -116,13 +116,13 @@ https://github.com/dotnet/wpf c5eab0a86ae720ca4d08cf51c97e4648ad008f8c - + https://github.com/dotnet/fsharp - f0b5108c92b92ba5ee440228aadba3bae79b43a3 + 470cfa0155392abb4727a32f0906c9b3d418e33d - + https://github.com/dotnet/fsharp - f0b5108c92b92ba5ee440228aadba3bae79b43a3 + 470cfa0155392abb4727a32f0906c9b3d418e33d diff --git a/eng/Versions.props b/eng/Versions.props index 160ad4b6f..d1d037301 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.100-rtm.21477.16 - 6.0.100-rtm.21477.16 + 6.0.100-rtm.21477.23 + 6.0.100-rtm.21477.23 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 8c8bd6a72e176923b91f79183c16809f44d8b17f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 28 Sep 2021 00:19:08 +0000 Subject: [PATCH 050/140] Update dependencies from https://github.com/dotnet/sdk build 20210927.28 (#12147) [release/6.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.NETCore.App.Ref: from 6.0.0-rtm.21472.13 to 6.0.0-rtm.21477.5 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.NetCore.TargetingPack.x64.6.0: from 6.0.0-rtm.21472.13 to 6.0.0-rtm.21477.5 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Runtime.win-x64: from 6.0.0-rtm.21472.13 to 6.0.0-rtm.21477.5 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Host.win-x64: from 6.0.0-rtm.21472.13 to 6.0.0-rtm.21477.5 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.DotNetHostResolver: from 6.0.0-rtm.21472.13 to 6.0.0-rtm.21477.5 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.Platforms: from 6.0.0-rtm.21472.13 to 6.0.0-rtm.21477.5 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.0-rtm.21472.13 to 6.0.0-rtm.21477.5 (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 3d64849b5..036b5b37b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,29 +17,29 @@ https://github.com/dotnet/windowsdesktop b03517b10a755777a9133057e2fa0f97796b5a23 - + https://github.com/dotnet/runtime - 491ed9a112559872c31ae40da8f6d9977ba4ce3a + 5eb9fd5547373d2c9c8d12a05bae696e8888e81e - + https://github.com/dotnet/runtime - 491ed9a112559872c31ae40da8f6d9977ba4ce3a + 5eb9fd5547373d2c9c8d12a05bae696e8888e81e - + https://github.com/dotnet/runtime - 491ed9a112559872c31ae40da8f6d9977ba4ce3a + 5eb9fd5547373d2c9c8d12a05bae696e8888e81e - + https://github.com/dotnet/runtime - 491ed9a112559872c31ae40da8f6d9977ba4ce3a + 5eb9fd5547373d2c9c8d12a05bae696e8888e81e - + https://github.com/dotnet/runtime - 491ed9a112559872c31ae40da8f6d9977ba4ce3a + 5eb9fd5547373d2c9c8d12a05bae696e8888e81e - + https://github.com/dotnet/runtime - 491ed9a112559872c31ae40da8f6d9977ba4ce3a + 5eb9fd5547373d2c9c8d12a05bae696e8888e81e @@ -47,9 +47,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 491ed9a112559872c31ae40da8f6d9977ba4ce3a + 5eb9fd5547373d2c9c8d12a05bae696e8888e81e https://github.com/dotnet/aspnetcore @@ -98,14 +98,14 @@ 4b53271e35147c45f26df629ae1530b51d574bcb - + https://github.com/dotnet/sdk - 500db9383936024e9e6cc37ec64ba99c59b501c4 + 4d22bf5b02b8d72337f6d00e877398749a7cceda - + https://github.com/dotnet/sdk - 500db9383936024e9e6cc37ec64ba99c59b501c4 + 4d22bf5b02b8d72337f6d00e877398749a7cceda diff --git a/eng/Versions.props b/eng/Versions.props index d1d037301..480fd9c34 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,24 +56,24 @@ - 6.0.100-rtm.21477.23 - 6.0.100-rtm.21477.23 + 6.0.100-rtm.21477.28 + 6.0.100-rtm.21477.28 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 6.0.0-rtm.21472.13 + 6.0.0-rtm.21477.5 - 6.0.0-rtm.21472.13 - 6.0.0-rtm.21472.13 - 6.0.0-rtm.21472.13 - 6.0.0-rtm.21472.13 - 6.0.0-rtm.21472.13 - 6.0.0-rtm.21472.13 + 6.0.0-rtm.21477.5 + 6.0.0-rtm.21477.5 + 6.0.0-rtm.21477.5 + 6.0.0-rtm.21477.5 + 6.0.0-rtm.21477.5 + 6.0.0-rtm.21477.5 2.1.0 From bc7f092c31d55634d386608e7f89dfe39609a5d5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 28 Sep 2021 01:20:25 +0000 Subject: [PATCH 051/140] Update dependencies from https://github.com/dotnet/sdk build 20210927.30 (#12148) [release/6.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.AspNetCore.App.Ref: from 6.0.0-rtm.21475.9 to 6.0.0-rtm.21477.12 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 6.0.0-rtm.21475.9 to 6.0.0-rtm.21477.12 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.0-rtm.21475.9 to 6.0.0-rtm.21477.12 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0: from 6.0.0-rtm.21475.9 to 6.0.0-rtm.21477.12 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 6.0.0-rtm.21475.9 to 6.0.0-rtm.21477.12 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 6.0.0-rtm.21475.9 to 6.0.0-rtm.21477.12 (parent: Microsoft.NET.Sdk) --- 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 036b5b37b..2f03c76db 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -51,30 +51,30 @@ https://github.com/dotnet/runtime 5eb9fd5547373d2c9c8d12a05bae696e8888e81e - + https://github.com/dotnet/aspnetcore - e66cee96d2d5cb024f80c8c1a976dc80ba791cf6 + 5a50336d539aaeb64d8f3173c9511a6955aa5866 - + https://github.com/dotnet/aspnetcore - e66cee96d2d5cb024f80c8c1a976dc80ba791cf6 + 5a50336d539aaeb64d8f3173c9511a6955aa5866 - + https://github.com/dotnet/aspnetcore - e66cee96d2d5cb024f80c8c1a976dc80ba791cf6 + 5a50336d539aaeb64d8f3173c9511a6955aa5866 - + https://github.com/dotnet/aspnetcore - e66cee96d2d5cb024f80c8c1a976dc80ba791cf6 + 5a50336d539aaeb64d8f3173c9511a6955aa5866 - + https://github.com/dotnet/aspnetcore - e66cee96d2d5cb024f80c8c1a976dc80ba791cf6 + 5a50336d539aaeb64d8f3173c9511a6955aa5866 - + https://github.com/dotnet/aspnetcore - e66cee96d2d5cb024f80c8c1a976dc80ba791cf6 + 5a50336d539aaeb64d8f3173c9511a6955aa5866 https://github.com/dotnet/test-templates @@ -98,14 +98,14 @@ 4b53271e35147c45f26df629ae1530b51d574bcb - + https://github.com/dotnet/sdk - 4d22bf5b02b8d72337f6d00e877398749a7cceda + 96ecbed8411f06783417f9d513e86c88d8ef1690 - + https://github.com/dotnet/sdk - 4d22bf5b02b8d72337f6d00e877398749a7cceda + 96ecbed8411f06783417f9d513e86c88d8ef1690 diff --git a/eng/Versions.props b/eng/Versions.props index 480fd9c34..8f695f3a1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,20 +44,20 @@ - 6.0.0-rtm.21475.9 - 6.0.0-rtm.21475.9 - 6.0.0-rtm.21475.9 - 6.0.0-rtm.21475.9 - 6.0.0-rtm.21475.9 - 6.0.0-rtm.21475.9 + 6.0.0-rtm.21477.12 + 6.0.0-rtm.21477.12 + 6.0.0-rtm.21477.12 + 6.0.0-rtm.21477.12 + 6.0.0-rtm.21477.12 + 6.0.0-rtm.21477.12 0.2.0 - 6.0.100-rtm.21477.28 - 6.0.100-rtm.21477.28 + 6.0.100-rtm.21477.30 + 6.0.100-rtm.21477.30 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From c8c4ccc8824bb0030fc5b0bd27edebdfeb9d6c3c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 28 Sep 2021 03:50:22 +0000 Subject: [PATCH 052/140] [release/6.0.1xx] Update dependencies from dotnet/sdk (#12149) [release/6.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.WindowsDesktop.App.Ref: from 6.0.0-rtm.21474.23 to 6.0.0-rtm.21477.1 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0: from 6.0.0-rtm.21474.23 to 6.0.0-rtm.21477.1 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0: from 6.0.0-rtm.21474.23 to 6.0.0-rtm.21477.1 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Ref: from 6.0.0-rtm.21477.5 to 6.0.0-rtm.21477.8 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.NetCore.TargetingPack.x64.6.0: from 6.0.0-rtm.21477.5 to 6.0.0-rtm.21477.8 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Runtime.win-x64: from 6.0.0-rtm.21477.5 to 6.0.0-rtm.21477.8 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Host.win-x64: from 6.0.0-rtm.21477.5 to 6.0.0-rtm.21477.8 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.DotNetHostResolver: from 6.0.0-rtm.21477.5 to 6.0.0-rtm.21477.8 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.Platforms: from 6.0.0-rtm.21477.5 to 6.0.0-rtm.21477.8 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref: from 6.0.0-rtm.21477.12 to 6.0.0-rtm.21477.19 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 6.0.0-rtm.21477.12 to 6.0.0-rtm.21477.19 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.0-rtm.21477.12 to 6.0.0-rtm.21477.19 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0: from 6.0.0-rtm.21477.12 to 6.0.0-rtm.21477.19 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 6.0.0-rtm.21477.12 to 6.0.0-rtm.21477.19 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 6.0.0-rtm.21477.12 to 6.0.0-rtm.21477.19 (parent: Microsoft.NET.Sdk) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.0-rtm.21474.23 to 6.0.0-rtm.21477.1 (parent: Microsoft.NET.Sdk) - Microsoft.Dotnet.WinForms.ProjectTemplates: from 6.0.0-rtm.21474.14 to 6.0.0-rtm.21477.3 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.0-rtm.21474.23 to 6.0.0-rtm.21477.1 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Wpf.ProjectTemplates: from 6.0.0-rtm.21474.20 to 6.0.0-rtm.21477.3 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.Build: from 17.0.0-preview-21477-03 to 17.0.0-preview-21477-04 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.0-rtm.21477.5 to 6.0.0-rtm.21477.8 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 88 ++++++++++++++++++++--------------------- eng/Versions.props | 42 ++++++++++---------- 2 files changed, 65 insertions(+), 65 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2f03c76db..180af8e79 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,45 +1,45 @@ - + https://github.com/dotnet/windowsdesktop - b03517b10a755777a9133057e2fa0f97796b5a23 + f133d494f5a1eba114739712db6ae7637ae035be - + https://github.com/dotnet/windowsdesktop - b03517b10a755777a9133057e2fa0f97796b5a23 + f133d494f5a1eba114739712db6ae7637ae035be - + https://github.com/dotnet/windowsdesktop - b03517b10a755777a9133057e2fa0f97796b5a23 + f133d494f5a1eba114739712db6ae7637ae035be - + https://github.com/dotnet/windowsdesktop - b03517b10a755777a9133057e2fa0f97796b5a23 + f133d494f5a1eba114739712db6ae7637ae035be - + https://github.com/dotnet/runtime - 5eb9fd5547373d2c9c8d12a05bae696e8888e81e + a7e9f9fb2363e21571da2950990106e7cc4f714e - + https://github.com/dotnet/runtime - 5eb9fd5547373d2c9c8d12a05bae696e8888e81e + a7e9f9fb2363e21571da2950990106e7cc4f714e - + https://github.com/dotnet/runtime - 5eb9fd5547373d2c9c8d12a05bae696e8888e81e + a7e9f9fb2363e21571da2950990106e7cc4f714e - + https://github.com/dotnet/runtime - 5eb9fd5547373d2c9c8d12a05bae696e8888e81e + a7e9f9fb2363e21571da2950990106e7cc4f714e - + https://github.com/dotnet/runtime - 5eb9fd5547373d2c9c8d12a05bae696e8888e81e + a7e9f9fb2363e21571da2950990106e7cc4f714e - + https://github.com/dotnet/runtime - 5eb9fd5547373d2c9c8d12a05bae696e8888e81e + a7e9f9fb2363e21571da2950990106e7cc4f714e @@ -47,34 +47,34 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 5eb9fd5547373d2c9c8d12a05bae696e8888e81e + a7e9f9fb2363e21571da2950990106e7cc4f714e - + https://github.com/dotnet/aspnetcore - 5a50336d539aaeb64d8f3173c9511a6955aa5866 + 35decd5a37fa196f340e39189b645acfe93383b5 - + https://github.com/dotnet/aspnetcore - 5a50336d539aaeb64d8f3173c9511a6955aa5866 + 35decd5a37fa196f340e39189b645acfe93383b5 - + https://github.com/dotnet/aspnetcore - 5a50336d539aaeb64d8f3173c9511a6955aa5866 + 35decd5a37fa196f340e39189b645acfe93383b5 - + https://github.com/dotnet/aspnetcore - 5a50336d539aaeb64d8f3173c9511a6955aa5866 + 35decd5a37fa196f340e39189b645acfe93383b5 - + https://github.com/dotnet/aspnetcore - 5a50336d539aaeb64d8f3173c9511a6955aa5866 + 35decd5a37fa196f340e39189b645acfe93383b5 - + https://github.com/dotnet/aspnetcore - 5a50336d539aaeb64d8f3173c9511a6955aa5866 + 35decd5a37fa196f340e39189b645acfe93383b5 https://github.com/dotnet/test-templates @@ -98,23 +98,23 @@ 4b53271e35147c45f26df629ae1530b51d574bcb - + https://github.com/dotnet/sdk - 96ecbed8411f06783417f9d513e86c88d8ef1690 + ff2d36940e1e7ebe7495ed911f0f68c0ca8fff64 - + https://github.com/dotnet/sdk - 96ecbed8411f06783417f9d513e86c88d8ef1690 + ff2d36940e1e7ebe7495ed911f0f68c0ca8fff64 - + https://github.com/dotnet/winforms - 48fac652bc0ebcf2526d19a9b238b0e4fe287170 + 29bdbdeb72ef6ab59663126e9acf0da83142a8b6 - + https://github.com/dotnet/wpf - c5eab0a86ae720ca4d08cf51c97e4648ad008f8c + caf5fd4ea5b1b08ffb55e8dc2e8e1dd8af6037e5 https://github.com/dotnet/fsharp @@ -140,9 +140,9 @@ 2cb3d482e3c09760d1b204c597be93f49dba3349 - + https://github.com/dotnet/msbuild - e123a0c1fb4a66a3fdcfbe8a8792183f7df5cc34 + 3a1e456fe227f3e2b190b434578844c31e8bcb4a diff --git a/eng/Versions.props b/eng/Versions.props index 8f695f3a1..204cda4d8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.0-rtm.21474.14 + 6.0.0-rtm.21477.3 - 6.0.0-rtm.21474.20 + 6.0.0-rtm.21477.3 @@ -44,44 +44,44 @@ - 6.0.0-rtm.21477.12 - 6.0.0-rtm.21477.12 - 6.0.0-rtm.21477.12 - 6.0.0-rtm.21477.12 - 6.0.0-rtm.21477.12 - 6.0.0-rtm.21477.12 + 6.0.0-rtm.21477.19 + 6.0.0-rtm.21477.19 + 6.0.0-rtm.21477.19 + 6.0.0-rtm.21477.19 + 6.0.0-rtm.21477.19 + 6.0.0-rtm.21477.19 0.2.0 - 6.0.100-rtm.21477.30 - 6.0.100-rtm.21477.30 + 6.0.100-rtm.21477.41 + 6.0.100-rtm.21477.41 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 6.0.0-rtm.21477.5 + 6.0.0-rtm.21477.8 - 6.0.0-rtm.21477.5 - 6.0.0-rtm.21477.5 - 6.0.0-rtm.21477.5 - 6.0.0-rtm.21477.5 - 6.0.0-rtm.21477.5 - 6.0.0-rtm.21477.5 + 6.0.0-rtm.21477.8 + 6.0.0-rtm.21477.8 + 6.0.0-rtm.21477.8 + 6.0.0-rtm.21477.8 + 6.0.0-rtm.21477.8 + 6.0.0-rtm.21477.8 2.1.0 - 6.0.0-rtm.21474.23 - 6.0.0-rtm.21474.23 - 6.0.0-rtm.21474.23 - 6.0.0-rtm.21474.23 + 6.0.0-rtm.21477.1 + 6.0.0-rtm.21477.1 + 6.0.0-rtm.21477.1 + 6.0.0-rtm.21477.1 From e0ef59918714719b0f37c0205672770e113ae836 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 28 Sep 2021 04:28:40 +0000 Subject: [PATCH 053/140] Update dependencies from https://github.com/dotnet/sdk build 20210927.47 (#12150) [release/6.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.Net.Compilers.Toolset: from 4.0.0-5.21471.19 to 4.0.0-5.21477.12 (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 180af8e79..8f71ec5d6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,14 +98,14 @@ 4b53271e35147c45f26df629ae1530b51d574bcb - + https://github.com/dotnet/sdk - ff2d36940e1e7ebe7495ed911f0f68c0ca8fff64 + 16eadb22990055f560304efacd8a54364e66243d - + https://github.com/dotnet/sdk - ff2d36940e1e7ebe7495ed911f0f68c0ca8fff64 + 16eadb22990055f560304efacd8a54364e66243d @@ -135,9 +135,9 @@ linker - + https://github.com/dotnet/roslyn - 2cb3d482e3c09760d1b204c597be93f49dba3349 + ea8b7316adb82d7b2ab9ab570d4ae100019f6a6e diff --git a/eng/Versions.props b/eng/Versions.props index 204cda4d8..40abab207 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.100-rtm.21477.41 - 6.0.100-rtm.21477.41 + 6.0.100-rtm.21477.47 + 6.0.100-rtm.21477.47 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 690faf288ecb7044a0974b0a3ddc3955318ca211 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 28 Sep 2021 05:10:02 +0000 Subject: [PATCH 054/140] [release/6.0.1xx] Update dependencies from dotnet/sdk (#12151) [release/6.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.WindowsDesktop.App.Ref: from 6.0.0-rtm.21477.1 to 6.0.0-rtm.21477.3 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0: from 6.0.0-rtm.21477.1 to 6.0.0-rtm.21477.3 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0: from 6.0.0-rtm.21477.1 to 6.0.0-rtm.21477.3 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref: from 6.0.0-rtm.21477.19 to 6.0.0-rtm.21477.22 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 6.0.0-rtm.21477.19 to 6.0.0-rtm.21477.22 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.0-rtm.21477.19 to 6.0.0-rtm.21477.22 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0: from 6.0.0-rtm.21477.19 to 6.0.0-rtm.21477.22 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 6.0.0-rtm.21477.19 to 6.0.0-rtm.21477.22 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 6.0.0-rtm.21477.19 to 6.0.0-rtm.21477.22 (parent: Microsoft.NET.Sdk) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.0-rtm.21477.1 to 6.0.0-rtm.21477.3 (parent: Microsoft.NET.Sdk) - Microsoft.Dotnet.WinForms.ProjectTemplates: from 6.0.0-rtm.21477.3 to 6.0.0-rtm.21477.5 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.0-rtm.21477.1 to 6.0.0-rtm.21477.3 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Wpf.ProjectTemplates: from 6.0.0-rtm.21477.3 to 6.0.0-rtm.21477.5 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) --- eng/Version.Details.xml | 56 ++++++++++++++++++++--------------------- eng/Versions.props | 28 ++++++++++----------- 2 files changed, 42 insertions(+), 42 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8f71ec5d6..f27b54660 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,21 +1,21 @@ - + https://github.com/dotnet/windowsdesktop - f133d494f5a1eba114739712db6ae7637ae035be + 59484487d08260cb60e1e0af6a3aeca9f1856bc1 - + https://github.com/dotnet/windowsdesktop - f133d494f5a1eba114739712db6ae7637ae035be + 59484487d08260cb60e1e0af6a3aeca9f1856bc1 - + https://github.com/dotnet/windowsdesktop - f133d494f5a1eba114739712db6ae7637ae035be + 59484487d08260cb60e1e0af6a3aeca9f1856bc1 - + https://github.com/dotnet/windowsdesktop - f133d494f5a1eba114739712db6ae7637ae035be + 59484487d08260cb60e1e0af6a3aeca9f1856bc1 https://github.com/dotnet/runtime @@ -51,30 +51,30 @@ https://github.com/dotnet/runtime a7e9f9fb2363e21571da2950990106e7cc4f714e - + https://github.com/dotnet/aspnetcore - 35decd5a37fa196f340e39189b645acfe93383b5 + 3ef082e5e46d99f61f9685237c1a77b320e28e4d - + https://github.com/dotnet/aspnetcore - 35decd5a37fa196f340e39189b645acfe93383b5 + 3ef082e5e46d99f61f9685237c1a77b320e28e4d - + https://github.com/dotnet/aspnetcore - 35decd5a37fa196f340e39189b645acfe93383b5 + 3ef082e5e46d99f61f9685237c1a77b320e28e4d - + https://github.com/dotnet/aspnetcore - 35decd5a37fa196f340e39189b645acfe93383b5 + 3ef082e5e46d99f61f9685237c1a77b320e28e4d - + https://github.com/dotnet/aspnetcore - 35decd5a37fa196f340e39189b645acfe93383b5 + 3ef082e5e46d99f61f9685237c1a77b320e28e4d - + https://github.com/dotnet/aspnetcore - 35decd5a37fa196f340e39189b645acfe93383b5 + 3ef082e5e46d99f61f9685237c1a77b320e28e4d https://github.com/dotnet/test-templates @@ -98,23 +98,23 @@ 4b53271e35147c45f26df629ae1530b51d574bcb - + https://github.com/dotnet/sdk - 16eadb22990055f560304efacd8a54364e66243d + f6c83ca73a57c9c1e65dbf5158ce56ae07cc94e2 - + https://github.com/dotnet/sdk - 16eadb22990055f560304efacd8a54364e66243d + f6c83ca73a57c9c1e65dbf5158ce56ae07cc94e2 - + https://github.com/dotnet/winforms - 29bdbdeb72ef6ab59663126e9acf0da83142a8b6 + 8c8ba989076d4ff3207f35ff5e0fefe0d16fc870 - + https://github.com/dotnet/wpf - caf5fd4ea5b1b08ffb55e8dc2e8e1dd8af6037e5 + 9adbba1ceeace4af8174707cd71a3cea75142419 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 40abab207..78b530911 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.0-rtm.21477.3 + 6.0.0-rtm.21477.5 - 6.0.0-rtm.21477.3 + 6.0.0-rtm.21477.5 @@ -44,20 +44,20 @@ - 6.0.0-rtm.21477.19 - 6.0.0-rtm.21477.19 - 6.0.0-rtm.21477.19 - 6.0.0-rtm.21477.19 - 6.0.0-rtm.21477.19 - 6.0.0-rtm.21477.19 + 6.0.0-rtm.21477.22 + 6.0.0-rtm.21477.22 + 6.0.0-rtm.21477.22 + 6.0.0-rtm.21477.22 + 6.0.0-rtm.21477.22 + 6.0.0-rtm.21477.22 0.2.0 - 6.0.100-rtm.21477.47 - 6.0.100-rtm.21477.47 + 6.0.100-rtm.21477.53 + 6.0.100-rtm.21477.53 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,10 +78,10 @@ - 6.0.0-rtm.21477.1 - 6.0.0-rtm.21477.1 - 6.0.0-rtm.21477.1 - 6.0.0-rtm.21477.1 + 6.0.0-rtm.21477.3 + 6.0.0-rtm.21477.3 + 6.0.0-rtm.21477.3 + 6.0.0-rtm.21477.3 From db76386387c9b19a8a7b77c5a718d38ccbf0bd85 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 28 Sep 2021 06:15:33 +0000 Subject: [PATCH 055/140] Update dependencies from https://github.com/dotnet/sdk build 20210927.56 (#12152) [release/6.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.Net.Compilers.Toolset: from 4.0.0-5.21477.12 to 4.0.0-5.21477.20 (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 f27b54660..86e41dd0a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,14 +98,14 @@ 4b53271e35147c45f26df629ae1530b51d574bcb - + https://github.com/dotnet/sdk - f6c83ca73a57c9c1e65dbf5158ce56ae07cc94e2 + 4b753da07fb2c2bf884e76a1a1486ddd27d58f5a - + https://github.com/dotnet/sdk - f6c83ca73a57c9c1e65dbf5158ce56ae07cc94e2 + 4b753da07fb2c2bf884e76a1a1486ddd27d58f5a @@ -135,9 +135,9 @@ linker - + https://github.com/dotnet/roslyn - ea8b7316adb82d7b2ab9ab570d4ae100019f6a6e + 1b3e47ab11ef33b79047e8abf8b3fe998300322f diff --git a/eng/Versions.props b/eng/Versions.props index 78b530911..3b5b0b729 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.100-rtm.21477.53 - 6.0.100-rtm.21477.53 + 6.0.100-rtm.21477.56 + 6.0.100-rtm.21477.56 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 6951ce9dd55e06487fc6a65301da2c4de1af76ee Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 28 Sep 2021 07:16:34 +0000 Subject: [PATCH 056/140] Update dependencies from https://github.com/dotnet/sdk build 20210927.60 (#12153) [release/6.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.Net.Compilers.Toolset: from 4.0.0-5.21477.20 to 4.0.0-5.21477.22 (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 86e41dd0a..fc4ba9f30 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,14 +98,14 @@ 4b53271e35147c45f26df629ae1530b51d574bcb - + https://github.com/dotnet/sdk - 4b753da07fb2c2bf884e76a1a1486ddd27d58f5a + 7cd67ed2ae1ccac5a96dd59b3283b5d578dd3b1d - + https://github.com/dotnet/sdk - 4b753da07fb2c2bf884e76a1a1486ddd27d58f5a + 7cd67ed2ae1ccac5a96dd59b3283b5d578dd3b1d @@ -135,9 +135,9 @@ linker - + https://github.com/dotnet/roslyn - 1b3e47ab11ef33b79047e8abf8b3fe998300322f + 5ffb5d962a98e9f3814569b7849b45ec85145906 diff --git a/eng/Versions.props b/eng/Versions.props index 3b5b0b729..f786a17b0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.100-rtm.21477.56 - 6.0.100-rtm.21477.56 + 6.0.100-rtm.21477.60 + 6.0.100-rtm.21477.60 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 9297f462ed5c414dd7a970ba1b0b6e2d13b4c412 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 28 Sep 2021 07:57:34 +0000 Subject: [PATCH 057/140] Update dependencies from https://github.com/dotnet/sdk build 20210927.61 (#12154) [release/6.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.AspNetCore.App.Ref: from 6.0.0-rtm.21477.22 to 6.0.0-rtm.21477.25 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 6.0.0-rtm.21477.22 to 6.0.0-rtm.21477.25 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.0-rtm.21477.22 to 6.0.0-rtm.21477.25 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0: from 6.0.0-rtm.21477.22 to 6.0.0-rtm.21477.25 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 6.0.0-rtm.21477.22 to 6.0.0-rtm.21477.25 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 6.0.0-rtm.21477.22 to 6.0.0-rtm.21477.25 (parent: Microsoft.NET.Sdk) --- 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 fc4ba9f30..ceaf0f685 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -51,30 +51,30 @@ https://github.com/dotnet/runtime a7e9f9fb2363e21571da2950990106e7cc4f714e - + https://github.com/dotnet/aspnetcore - 3ef082e5e46d99f61f9685237c1a77b320e28e4d + ad7c2945bf1e7b83eb6ed10a33789afa9e4719ed - + https://github.com/dotnet/aspnetcore - 3ef082e5e46d99f61f9685237c1a77b320e28e4d + ad7c2945bf1e7b83eb6ed10a33789afa9e4719ed - + https://github.com/dotnet/aspnetcore - 3ef082e5e46d99f61f9685237c1a77b320e28e4d + ad7c2945bf1e7b83eb6ed10a33789afa9e4719ed - + https://github.com/dotnet/aspnetcore - 3ef082e5e46d99f61f9685237c1a77b320e28e4d + ad7c2945bf1e7b83eb6ed10a33789afa9e4719ed - + https://github.com/dotnet/aspnetcore - 3ef082e5e46d99f61f9685237c1a77b320e28e4d + ad7c2945bf1e7b83eb6ed10a33789afa9e4719ed - + https://github.com/dotnet/aspnetcore - 3ef082e5e46d99f61f9685237c1a77b320e28e4d + ad7c2945bf1e7b83eb6ed10a33789afa9e4719ed https://github.com/dotnet/test-templates @@ -98,14 +98,14 @@ 4b53271e35147c45f26df629ae1530b51d574bcb - + https://github.com/dotnet/sdk - 7cd67ed2ae1ccac5a96dd59b3283b5d578dd3b1d + 1bf79e39d312feab58164f5213f2e6ee447c102c - + https://github.com/dotnet/sdk - 7cd67ed2ae1ccac5a96dd59b3283b5d578dd3b1d + 1bf79e39d312feab58164f5213f2e6ee447c102c diff --git a/eng/Versions.props b/eng/Versions.props index f786a17b0..ca60b13db 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,20 +44,20 @@ - 6.0.0-rtm.21477.22 - 6.0.0-rtm.21477.22 - 6.0.0-rtm.21477.22 - 6.0.0-rtm.21477.22 - 6.0.0-rtm.21477.22 - 6.0.0-rtm.21477.22 + 6.0.0-rtm.21477.25 + 6.0.0-rtm.21477.25 + 6.0.0-rtm.21477.25 + 6.0.0-rtm.21477.25 + 6.0.0-rtm.21477.25 + 6.0.0-rtm.21477.25 0.2.0 - 6.0.100-rtm.21477.60 - 6.0.100-rtm.21477.60 + 6.0.100-rtm.21477.61 + 6.0.100-rtm.21477.61 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From e575855f3f8354b8fbabc435ac59901b1fa06189 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 28 Sep 2021 09:54:15 +0000 Subject: [PATCH 058/140] Update dependencies from https://github.com/dotnet/sdk build 20210928.4 (#12155) [release/6.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.AspNetCore.App.Ref: from 6.0.0-rtm.21477.25 to 6.0.0-rtm.21477.30 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 6.0.0-rtm.21477.25 to 6.0.0-rtm.21477.30 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.0-rtm.21477.25 to 6.0.0-rtm.21477.30 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0: from 6.0.0-rtm.21477.25 to 6.0.0-rtm.21477.30 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 6.0.0-rtm.21477.25 to 6.0.0-rtm.21477.30 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 6.0.0-rtm.21477.25 to 6.0.0-rtm.21477.30 (parent: Microsoft.NET.Sdk) --- 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 ceaf0f685..3768c20c9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -51,30 +51,30 @@ https://github.com/dotnet/runtime a7e9f9fb2363e21571da2950990106e7cc4f714e - + https://github.com/dotnet/aspnetcore - ad7c2945bf1e7b83eb6ed10a33789afa9e4719ed + 4385e49947c710325b3e3d3597fad89d962cf876 - + https://github.com/dotnet/aspnetcore - ad7c2945bf1e7b83eb6ed10a33789afa9e4719ed + 4385e49947c710325b3e3d3597fad89d962cf876 - + https://github.com/dotnet/aspnetcore - ad7c2945bf1e7b83eb6ed10a33789afa9e4719ed + 4385e49947c710325b3e3d3597fad89d962cf876 - + https://github.com/dotnet/aspnetcore - ad7c2945bf1e7b83eb6ed10a33789afa9e4719ed + 4385e49947c710325b3e3d3597fad89d962cf876 - + https://github.com/dotnet/aspnetcore - ad7c2945bf1e7b83eb6ed10a33789afa9e4719ed + 4385e49947c710325b3e3d3597fad89d962cf876 - + https://github.com/dotnet/aspnetcore - ad7c2945bf1e7b83eb6ed10a33789afa9e4719ed + 4385e49947c710325b3e3d3597fad89d962cf876 https://github.com/dotnet/test-templates @@ -98,14 +98,14 @@ 4b53271e35147c45f26df629ae1530b51d574bcb - + https://github.com/dotnet/sdk - 1bf79e39d312feab58164f5213f2e6ee447c102c + 2c58019a926a6ffb5f1340e001d4aa428fe166ed - + https://github.com/dotnet/sdk - 1bf79e39d312feab58164f5213f2e6ee447c102c + 2c58019a926a6ffb5f1340e001d4aa428fe166ed diff --git a/eng/Versions.props b/eng/Versions.props index ca60b13db..dddbffa61 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,20 +44,20 @@ - 6.0.0-rtm.21477.25 - 6.0.0-rtm.21477.25 - 6.0.0-rtm.21477.25 - 6.0.0-rtm.21477.25 - 6.0.0-rtm.21477.25 - 6.0.0-rtm.21477.25 + 6.0.0-rtm.21477.30 + 6.0.0-rtm.21477.30 + 6.0.0-rtm.21477.30 + 6.0.0-rtm.21477.30 + 6.0.0-rtm.21477.30 + 6.0.0-rtm.21477.30 0.2.0 - 6.0.100-rtm.21477.61 - 6.0.100-rtm.21477.61 + 6.0.100-rtm.21478.4 + 6.0.100-rtm.21478.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From b83da76f5fede9432ca6efce8652a616efff2ea6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 28 Sep 2021 10:40:37 +0000 Subject: [PATCH 059/140] Update dependencies from https://github.com/dotnet/sdk build 20210928.9 (#12156) [release/6.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.Net.Compilers.Toolset: from 4.0.0-5.21477.22 to 4.0.0-5.21477.26 (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 3768c20c9..ab7184865 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,14 +98,14 @@ 4b53271e35147c45f26df629ae1530b51d574bcb - + https://github.com/dotnet/sdk - 2c58019a926a6ffb5f1340e001d4aa428fe166ed + f2c6b8c0dc8cb01a073ba49e84c4d5c9e02ffa65 - + https://github.com/dotnet/sdk - 2c58019a926a6ffb5f1340e001d4aa428fe166ed + f2c6b8c0dc8cb01a073ba49e84c4d5c9e02ffa65 @@ -135,9 +135,9 @@ linker - + https://github.com/dotnet/roslyn - 5ffb5d962a98e9f3814569b7849b45ec85145906 + 379dd53d38cd78db7249b5dd5b1a0ca177fd9b20 diff --git a/eng/Versions.props b/eng/Versions.props index dddbffa61..3f8edf460 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.100-rtm.21478.4 - 6.0.100-rtm.21478.4 + 6.0.100-rtm.21478.9 + 6.0.100-rtm.21478.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 13861adc51af7deda2fac79527a9d69317fd86e0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 28 Sep 2021 14:41:57 +0000 Subject: [PATCH 060/140] Update dependencies from https://github.com/dotnet/sdk build 20210928.14 (#12157) [release/6.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.Net.Compilers.Toolset: from 4.0.0-5.21477.26 to 4.0.0-5.21478.2 (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 ab7184865..f41114d66 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,14 +98,14 @@ 4b53271e35147c45f26df629ae1530b51d574bcb - + https://github.com/dotnet/sdk - f2c6b8c0dc8cb01a073ba49e84c4d5c9e02ffa65 + cf3fac5a3f2ca20ffd58babb8233a4f838c098a9 - + https://github.com/dotnet/sdk - f2c6b8c0dc8cb01a073ba49e84c4d5c9e02ffa65 + cf3fac5a3f2ca20ffd58babb8233a4f838c098a9 @@ -135,9 +135,9 @@ linker - + https://github.com/dotnet/roslyn - 379dd53d38cd78db7249b5dd5b1a0ca177fd9b20 + fb1d57aa6e3456e97c955e029d6f65f0dff1cc8e diff --git a/eng/Versions.props b/eng/Versions.props index 3f8edf460..573f90e0f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.100-rtm.21478.9 - 6.0.100-rtm.21478.9 + 6.0.100-rtm.21478.14 + 6.0.100-rtm.21478.14 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 54aa8bcd30c6966fa012048a08053d841b36443c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 28 Sep 2021 15:39:42 +0000 Subject: [PATCH 061/140] Update dependencies from https://github.com/dotnet/sdk build 20210928.16 (#12159) [release/6.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.DotNet.Common.ItemTemplates: from 6.0.100-rtm.21473.1 to 6.0.100-rtm.21478.1 (parent: Microsoft.NET.Sdk) - Microsoft.TemplateEngine.Cli: from 6.0.100-rtm.21473.1 to 6.0.100-rtm.21478.1 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f41114d66..0a9c98dc3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -89,23 +89,23 @@ c40ef7e056b48e011c43a21354d6790ba6b8b4fc - + https://github.com/dotnet/templating - 4b53271e35147c45f26df629ae1530b51d574bcb + 0e3571f5067cec6f969a6e4d5521c2223e1177b8 - + https://github.com/dotnet/templating - 4b53271e35147c45f26df629ae1530b51d574bcb + 0e3571f5067cec6f969a6e4d5521c2223e1177b8 - + https://github.com/dotnet/sdk - cf3fac5a3f2ca20ffd58babb8233a4f838c098a9 + 984159f5edaee5e7f36e3ab2e2be460131ec10e3 - + https://github.com/dotnet/sdk - cf3fac5a3f2ca20ffd58babb8233a4f838c098a9 + 984159f5edaee5e7f36e3ab2e2be460131ec10e3 diff --git a/eng/Versions.props b/eng/Versions.props index 573f90e0f..bce4bc5f8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,7 +31,7 @@ - 6.0.100-rtm.21473.1 + 6.0.100-rtm.21478.1 @@ -56,8 +56,8 @@ - 6.0.100-rtm.21478.14 - 6.0.100-rtm.21478.14 + 6.0.100-rtm.21478.16 + 6.0.100-rtm.21478.16 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 8fa92bad72bdcb07375a6bf0a4460ef5f6b07608 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 28 Sep 2021 16:35:33 +0000 Subject: [PATCH 062/140] Update dependencies from https://github.com/dotnet/sdk build 20210928.17 (#12160) [release/6.0.1xx] Update dependencies from dotnet/sdk --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0a9c98dc3..37243d2b3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,14 +98,14 @@ 0e3571f5067cec6f969a6e4d5521c2223e1177b8 - + https://github.com/dotnet/sdk - 984159f5edaee5e7f36e3ab2e2be460131ec10e3 + e890d755b95f290bbcc1aa5984451fd44603ea72 - + https://github.com/dotnet/sdk - 984159f5edaee5e7f36e3ab2e2be460131ec10e3 + e890d755b95f290bbcc1aa5984451fd44603ea72 diff --git a/eng/Versions.props b/eng/Versions.props index bce4bc5f8..4492f988a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.100-rtm.21478.16 - 6.0.100-rtm.21478.16 + 6.0.100-rtm.21478.17 + 6.0.100-rtm.21478.17 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 9932914917a663a09b7c37ef65b7225ea4756c45 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 28 Sep 2021 22:21:31 +0000 Subject: [PATCH 063/140] Update dependencies from https://github.com/dotnet/sdk build 20210928.27 (#12165) [release/6.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.AspNetCore.App.Ref: from 6.0.0-rtm.21477.30 to 6.0.0-rtm.21478.5 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 6.0.0-rtm.21477.30 to 6.0.0-rtm.21478.5 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.0-rtm.21477.30 to 6.0.0-rtm.21478.5 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0: from 6.0.0-rtm.21477.30 to 6.0.0-rtm.21478.5 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 6.0.0-rtm.21477.30 to 6.0.0-rtm.21478.5 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 6.0.0-rtm.21477.30 to 6.0.0-rtm.21478.5 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Common.ItemTemplates: from 6.0.100-rtm.21478.1 to 6.0.100-rtm.21478.4 (parent: Microsoft.NET.Sdk) - Microsoft.TemplateEngine.Cli: from 6.0.100-rtm.21478.1 to 6.0.100-rtm.21478.4 (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 37243d2b3..81243646b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -51,30 +51,30 @@ https://github.com/dotnet/runtime a7e9f9fb2363e21571da2950990106e7cc4f714e - + https://github.com/dotnet/aspnetcore - 4385e49947c710325b3e3d3597fad89d962cf876 + 8a9e0aaddde939b569cf3a7dff68e94b8b853878 - + https://github.com/dotnet/aspnetcore - 4385e49947c710325b3e3d3597fad89d962cf876 + 8a9e0aaddde939b569cf3a7dff68e94b8b853878 - + https://github.com/dotnet/aspnetcore - 4385e49947c710325b3e3d3597fad89d962cf876 + 8a9e0aaddde939b569cf3a7dff68e94b8b853878 - + https://github.com/dotnet/aspnetcore - 4385e49947c710325b3e3d3597fad89d962cf876 + 8a9e0aaddde939b569cf3a7dff68e94b8b853878 - + https://github.com/dotnet/aspnetcore - 4385e49947c710325b3e3d3597fad89d962cf876 + 8a9e0aaddde939b569cf3a7dff68e94b8b853878 - + https://github.com/dotnet/aspnetcore - 4385e49947c710325b3e3d3597fad89d962cf876 + 8a9e0aaddde939b569cf3a7dff68e94b8b853878 https://github.com/dotnet/test-templates @@ -89,23 +89,23 @@ c40ef7e056b48e011c43a21354d6790ba6b8b4fc - + https://github.com/dotnet/templating - 0e3571f5067cec6f969a6e4d5521c2223e1177b8 + d1abf4b7bc061aa76afbdf914e318ac07ad9cfcb - + https://github.com/dotnet/templating - 0e3571f5067cec6f969a6e4d5521c2223e1177b8 + d1abf4b7bc061aa76afbdf914e318ac07ad9cfcb - + https://github.com/dotnet/sdk - e890d755b95f290bbcc1aa5984451fd44603ea72 + f14bf8f36b8592a8b722fa4f3aeff49c02e77bf1 - + https://github.com/dotnet/sdk - e890d755b95f290bbcc1aa5984451fd44603ea72 + f14bf8f36b8592a8b722fa4f3aeff49c02e77bf1 diff --git a/eng/Versions.props b/eng/Versions.props index 4492f988a..b469e5125 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,7 +31,7 @@ - 6.0.100-rtm.21478.1 + 6.0.100-rtm.21478.4 @@ -44,20 +44,20 @@ - 6.0.0-rtm.21477.30 - 6.0.0-rtm.21477.30 - 6.0.0-rtm.21477.30 - 6.0.0-rtm.21477.30 - 6.0.0-rtm.21477.30 - 6.0.0-rtm.21477.30 + 6.0.0-rtm.21478.5 + 6.0.0-rtm.21478.5 + 6.0.0-rtm.21478.5 + 6.0.0-rtm.21478.5 + 6.0.0-rtm.21478.5 + 6.0.0-rtm.21478.5 0.2.0 - 6.0.100-rtm.21478.17 - 6.0.100-rtm.21478.17 + 6.0.100-rtm.21478.27 + 6.0.100-rtm.21478.27 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 073e840f223caab749beed2f9d160b50a0fbd359 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 28 Sep 2021 23:22:41 +0000 Subject: [PATCH 064/140] Update dependencies from https://github.com/dotnet/sdk build 20210928.31 (#12166) [release/6.0.1xx] Update dependencies from dotnet/sdk --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 81243646b..960695ad8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,14 +98,14 @@ d1abf4b7bc061aa76afbdf914e318ac07ad9cfcb - + https://github.com/dotnet/sdk - f14bf8f36b8592a8b722fa4f3aeff49c02e77bf1 + d0b9b27699fdb7e6ca353745db387448e29a1c7e - + https://github.com/dotnet/sdk - f14bf8f36b8592a8b722fa4f3aeff49c02e77bf1 + d0b9b27699fdb7e6ca353745db387448e29a1c7e diff --git a/eng/Versions.props b/eng/Versions.props index b469e5125..7c669d417 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.100-rtm.21478.27 - 6.0.100-rtm.21478.27 + 6.0.100-rtm.21478.31 + 6.0.100-rtm.21478.31 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 6b4de10f1d7126fd3d6ffcb14b304424f1b04f05 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 29 Sep 2021 00:52:01 +0000 Subject: [PATCH 065/140] Update dependencies from https://github.com/dotnet/sdk build 20210928.32 (#12167) [release/6.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.AspNetCore.App.Ref: from 6.0.0-rtm.21478.5 to 6.0.0-rtm.21478.9 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 6.0.0-rtm.21478.5 to 6.0.0-rtm.21478.9 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.0-rtm.21478.5 to 6.0.0-rtm.21478.9 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0: from 6.0.0-rtm.21478.5 to 6.0.0-rtm.21478.9 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 6.0.0-rtm.21478.5 to 6.0.0-rtm.21478.9 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 6.0.0-rtm.21478.5 to 6.0.0-rtm.21478.9 (parent: Microsoft.NET.Sdk) --- 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 960695ad8..adaaca0d4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -51,30 +51,30 @@ https://github.com/dotnet/runtime a7e9f9fb2363e21571da2950990106e7cc4f714e - + https://github.com/dotnet/aspnetcore - 8a9e0aaddde939b569cf3a7dff68e94b8b853878 + 092ae9993ed672e142833ff82f605cd4c4a01279 - + https://github.com/dotnet/aspnetcore - 8a9e0aaddde939b569cf3a7dff68e94b8b853878 + 092ae9993ed672e142833ff82f605cd4c4a01279 - + https://github.com/dotnet/aspnetcore - 8a9e0aaddde939b569cf3a7dff68e94b8b853878 + 092ae9993ed672e142833ff82f605cd4c4a01279 - + https://github.com/dotnet/aspnetcore - 8a9e0aaddde939b569cf3a7dff68e94b8b853878 + 092ae9993ed672e142833ff82f605cd4c4a01279 - + https://github.com/dotnet/aspnetcore - 8a9e0aaddde939b569cf3a7dff68e94b8b853878 + 092ae9993ed672e142833ff82f605cd4c4a01279 - + https://github.com/dotnet/aspnetcore - 8a9e0aaddde939b569cf3a7dff68e94b8b853878 + 092ae9993ed672e142833ff82f605cd4c4a01279 https://github.com/dotnet/test-templates @@ -98,14 +98,14 @@ d1abf4b7bc061aa76afbdf914e318ac07ad9cfcb - + https://github.com/dotnet/sdk - d0b9b27699fdb7e6ca353745db387448e29a1c7e + 2123fed377489f85392b787d6c2a0fb94a3a0b80 - + https://github.com/dotnet/sdk - d0b9b27699fdb7e6ca353745db387448e29a1c7e + 2123fed377489f85392b787d6c2a0fb94a3a0b80 diff --git a/eng/Versions.props b/eng/Versions.props index 7c669d417..159952bd4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,20 +44,20 @@ - 6.0.0-rtm.21478.5 - 6.0.0-rtm.21478.5 - 6.0.0-rtm.21478.5 - 6.0.0-rtm.21478.5 - 6.0.0-rtm.21478.5 - 6.0.0-rtm.21478.5 + 6.0.0-rtm.21478.9 + 6.0.0-rtm.21478.9 + 6.0.0-rtm.21478.9 + 6.0.0-rtm.21478.9 + 6.0.0-rtm.21478.9 + 6.0.0-rtm.21478.9 0.2.0 - 6.0.100-rtm.21478.31 - 6.0.100-rtm.21478.31 + 6.0.100-rtm.21478.32 + 6.0.100-rtm.21478.32 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From d66229583179d69d43c063fb768147a4f3976840 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 29 Sep 2021 01:37:38 +0000 Subject: [PATCH 066/140] Update dependencies from https://github.com/dotnet/sdk build 20210928.37 (#12169) [release/6.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.AspNetCore.App.Ref: from 6.0.0-rtm.21478.9 to 6.0.0-rtm.21478.10 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 6.0.0-rtm.21478.9 to 6.0.0-rtm.21478.10 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.0-rtm.21478.9 to 6.0.0-rtm.21478.10 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0: from 6.0.0-rtm.21478.9 to 6.0.0-rtm.21478.10 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 6.0.0-rtm.21478.9 to 6.0.0-rtm.21478.10 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 6.0.0-rtm.21478.9 to 6.0.0-rtm.21478.10 (parent: Microsoft.NET.Sdk) --- 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 adaaca0d4..28ec8756b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -51,30 +51,30 @@ https://github.com/dotnet/runtime a7e9f9fb2363e21571da2950990106e7cc4f714e - + https://github.com/dotnet/aspnetcore - 092ae9993ed672e142833ff82f605cd4c4a01279 + 0168a9d5ef76ea8cf0671ef8af71fd760b7cd16a - + https://github.com/dotnet/aspnetcore - 092ae9993ed672e142833ff82f605cd4c4a01279 + 0168a9d5ef76ea8cf0671ef8af71fd760b7cd16a - + https://github.com/dotnet/aspnetcore - 092ae9993ed672e142833ff82f605cd4c4a01279 + 0168a9d5ef76ea8cf0671ef8af71fd760b7cd16a - + https://github.com/dotnet/aspnetcore - 092ae9993ed672e142833ff82f605cd4c4a01279 + 0168a9d5ef76ea8cf0671ef8af71fd760b7cd16a - + https://github.com/dotnet/aspnetcore - 092ae9993ed672e142833ff82f605cd4c4a01279 + 0168a9d5ef76ea8cf0671ef8af71fd760b7cd16a - + https://github.com/dotnet/aspnetcore - 092ae9993ed672e142833ff82f605cd4c4a01279 + 0168a9d5ef76ea8cf0671ef8af71fd760b7cd16a https://github.com/dotnet/test-templates @@ -98,14 +98,14 @@ d1abf4b7bc061aa76afbdf914e318ac07ad9cfcb - + https://github.com/dotnet/sdk - 2123fed377489f85392b787d6c2a0fb94a3a0b80 + 6bd29fbc8e79d08bcff72f761c8b20f1dbe1c033 - + https://github.com/dotnet/sdk - 2123fed377489f85392b787d6c2a0fb94a3a0b80 + 6bd29fbc8e79d08bcff72f761c8b20f1dbe1c033 diff --git a/eng/Versions.props b/eng/Versions.props index 159952bd4..fd658b963 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,20 +44,20 @@ - 6.0.0-rtm.21478.9 - 6.0.0-rtm.21478.9 - 6.0.0-rtm.21478.9 - 6.0.0-rtm.21478.9 - 6.0.0-rtm.21478.9 - 6.0.0-rtm.21478.9 + 6.0.0-rtm.21478.10 + 6.0.0-rtm.21478.10 + 6.0.0-rtm.21478.10 + 6.0.0-rtm.21478.10 + 6.0.0-rtm.21478.10 + 6.0.0-rtm.21478.10 0.2.0 - 6.0.100-rtm.21478.32 - 6.0.100-rtm.21478.32 + 6.0.100-rtm.21478.37 + 6.0.100-rtm.21478.37 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 41b4ddb4566e795b84ce2624e1eac77d22f2e585 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 29 Sep 2021 02:27:05 +0000 Subject: [PATCH 067/140] Update dependencies from https://github.com/dotnet/sdk build 20210928.40 (#12170) [release/6.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.Net.Compilers.Toolset: from 4.0.0-5.21478.2 to 4.0.0-5.21478.7 (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 28ec8756b..43e22bfc7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,14 +98,14 @@ d1abf4b7bc061aa76afbdf914e318ac07ad9cfcb - + https://github.com/dotnet/sdk - 6bd29fbc8e79d08bcff72f761c8b20f1dbe1c033 + 3c7c0718adfba11b31204a76f023708dd544191c - + https://github.com/dotnet/sdk - 6bd29fbc8e79d08bcff72f761c8b20f1dbe1c033 + 3c7c0718adfba11b31204a76f023708dd544191c @@ -135,9 +135,9 @@ linker - + https://github.com/dotnet/roslyn - fb1d57aa6e3456e97c955e029d6f65f0dff1cc8e + 2d5fb6aa0162a9b4790f7402eb922f65b04559f7 diff --git a/eng/Versions.props b/eng/Versions.props index fd658b963..6ffe94a9d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.100-rtm.21478.37 - 6.0.100-rtm.21478.37 + 6.0.100-rtm.21478.40 + 6.0.100-rtm.21478.40 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 0119f630ff700eb565a850556898d754df7fc1dd Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 29 Sep 2021 03:28:00 +0000 Subject: [PATCH 068/140] [release/6.0.1xx] Update dependencies from dotnet/sdk (#12172) [release/6.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.Net.Compilers.Toolset: from 4.0.0-5.21478.7 to 4.0.0-5.21478.13 (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 43e22bfc7..5b4db37b5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,14 +98,14 @@ d1abf4b7bc061aa76afbdf914e318ac07ad9cfcb - + https://github.com/dotnet/sdk - 3c7c0718adfba11b31204a76f023708dd544191c + 1cccfc97a6af5054413cdf8d27115eeb56271bf3 - + https://github.com/dotnet/sdk - 3c7c0718adfba11b31204a76f023708dd544191c + 1cccfc97a6af5054413cdf8d27115eeb56271bf3 @@ -135,9 +135,9 @@ linker - + https://github.com/dotnet/roslyn - 2d5fb6aa0162a9b4790f7402eb922f65b04559f7 + fbfe9cfb550b35a9629e8c54a2a98f595ba896a0 diff --git a/eng/Versions.props b/eng/Versions.props index 6ffe94a9d..d06c49090 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.100-rtm.21478.40 - 6.0.100-rtm.21478.40 + 6.0.100-rtm.21478.46 + 6.0.100-rtm.21478.46 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 265295878f4c549c676e4a0810ed5a03e00b5c3f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 29 Sep 2021 08:09:45 +0000 Subject: [PATCH 069/140] Update dependencies from https://github.com/dotnet/sdk build 20210928.51 (#12176) [release/6.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.Net.Compilers.Toolset: from 4.0.0-5.21478.13 to 4.0.0-5.21478.16 (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 5b4db37b5..83e50cfd9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,14 +98,14 @@ d1abf4b7bc061aa76afbdf914e318ac07ad9cfcb - + https://github.com/dotnet/sdk - 1cccfc97a6af5054413cdf8d27115eeb56271bf3 + 2b322eb3eaf75d39c91b9c41db7776f3b6e03f46 - + https://github.com/dotnet/sdk - 1cccfc97a6af5054413cdf8d27115eeb56271bf3 + 2b322eb3eaf75d39c91b9c41db7776f3b6e03f46 @@ -135,9 +135,9 @@ linker - + https://github.com/dotnet/roslyn - fbfe9cfb550b35a9629e8c54a2a98f595ba896a0 + 718a54716f4b37aa74d908d58d0979135583cd51 diff --git a/eng/Versions.props b/eng/Versions.props index d06c49090..6951c684c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.100-rtm.21478.46 - 6.0.100-rtm.21478.46 + 6.0.100-rtm.21478.51 + 6.0.100-rtm.21478.51 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From baa620de3549297b933dc751d9d2c1d65ded1fba Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 29 Sep 2021 10:05:43 +0000 Subject: [PATCH 070/140] Update dependencies from https://github.com/dotnet/sdk build 20210929.4 (#12179) [release/6.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.Net.Compilers.Toolset: from 4.0.0-5.21478.16 to 4.0.0-5.21478.20 (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 83e50cfd9..1fc9a30ed 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,14 +98,14 @@ d1abf4b7bc061aa76afbdf914e318ac07ad9cfcb - + https://github.com/dotnet/sdk - 2b322eb3eaf75d39c91b9c41db7776f3b6e03f46 + 7d289429776c851f5ca7a00d831426bde272971d - + https://github.com/dotnet/sdk - 2b322eb3eaf75d39c91b9c41db7776f3b6e03f46 + 7d289429776c851f5ca7a00d831426bde272971d @@ -135,9 +135,9 @@ linker - + https://github.com/dotnet/roslyn - 718a54716f4b37aa74d908d58d0979135583cd51 + 99e24c209e8a1436439fc8a0326cca7260e3878f diff --git a/eng/Versions.props b/eng/Versions.props index 6951c684c..edd511798 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.100-rtm.21478.51 - 6.0.100-rtm.21478.51 + 6.0.100-rtm.21479.4 + 6.0.100-rtm.21479.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From feb11bf4996d769c15f098914e66e2074d504b1b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 29 Sep 2021 11:15:47 +0000 Subject: [PATCH 071/140] Update dependencies from https://github.com/dotnet/sdk build 20210929.6 (#12180) [release/6.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.NETCore.App.Ref: from 6.0.0-rtm.21477.8 to 6.0.0-rtm.21478.11 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.NetCore.TargetingPack.x64.6.0: from 6.0.0-rtm.21477.8 to 6.0.0-rtm.21478.11 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Runtime.win-x64: from 6.0.0-rtm.21477.8 to 6.0.0-rtm.21478.11 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Host.win-x64: from 6.0.0-rtm.21477.8 to 6.0.0-rtm.21478.11 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.DotNetHostResolver: from 6.0.0-rtm.21477.8 to 6.0.0-rtm.21478.11 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.Platforms: from 6.0.0-rtm.21477.8 to 6.0.0-rtm.21478.11 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.0-rtm.21477.8 to 6.0.0-rtm.21478.11 (parent: Microsoft.NET.Sdk) - Microsoft.NET.Workload.Emscripten.Manifest-6.0.100: from 6.0.0-rc.2.21464.1 to 6.0.0-rc.2.21474.1 (parent: VS.Redist.Common.NetCore.SharedFramework.x64.6.0) --- eng/Version.Details.xml | 40 ++++++++++++++++++++-------------------- eng/Versions.props | 20 ++++++++++---------- 2 files changed, 30 insertions(+), 30 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1fc9a30ed..668b56a74 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,29 +17,29 @@ https://github.com/dotnet/windowsdesktop 59484487d08260cb60e1e0af6a3aeca9f1856bc1 - + https://github.com/dotnet/runtime - a7e9f9fb2363e21571da2950990106e7cc4f714e + 9e0a252fd3c5e928973cd08bc1a94ca8dbe7cb84 - + https://github.com/dotnet/runtime - a7e9f9fb2363e21571da2950990106e7cc4f714e + 9e0a252fd3c5e928973cd08bc1a94ca8dbe7cb84 - + https://github.com/dotnet/runtime - a7e9f9fb2363e21571da2950990106e7cc4f714e + 9e0a252fd3c5e928973cd08bc1a94ca8dbe7cb84 - + https://github.com/dotnet/runtime - a7e9f9fb2363e21571da2950990106e7cc4f714e + 9e0a252fd3c5e928973cd08bc1a94ca8dbe7cb84 - + https://github.com/dotnet/runtime - a7e9f9fb2363e21571da2950990106e7cc4f714e + 9e0a252fd3c5e928973cd08bc1a94ca8dbe7cb84 - + https://github.com/dotnet/runtime - a7e9f9fb2363e21571da2950990106e7cc4f714e + 9e0a252fd3c5e928973cd08bc1a94ca8dbe7cb84 @@ -47,9 +47,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - a7e9f9fb2363e21571da2950990106e7cc4f714e + 9e0a252fd3c5e928973cd08bc1a94ca8dbe7cb84 https://github.com/dotnet/aspnetcore @@ -98,14 +98,14 @@ d1abf4b7bc061aa76afbdf914e318ac07ad9cfcb - + https://github.com/dotnet/sdk - 7d289429776c851f5ca7a00d831426bde272971d + 0dcfbe209d540d3c0846175da646de0dd246d626 - + https://github.com/dotnet/sdk - 7d289429776c851f5ca7a00d831426bde272971d + 0dcfbe209d540d3c0846175da646de0dd246d626 @@ -158,9 +158,9 @@ https://github.com/aspnet/xdt c01a538851a8ab1a1fbeb2e6243f391fff7587b4 - + https://github.com/dotnet/emsdk - 9838ec0843442f761488cfec9cf34612c9f675e6 + 885a25579f723c790c1d91e4fc4939390429ccbc https://github.com/dotnet/source-build diff --git a/eng/Versions.props b/eng/Versions.props index edd511798..5cc6476b4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,24 +56,24 @@ - 6.0.100-rtm.21479.4 - 6.0.100-rtm.21479.4 + 6.0.100-rtm.21479.6 + 6.0.100-rtm.21479.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 6.0.0-rtm.21477.8 + 6.0.0-rtm.21478.11 - 6.0.0-rtm.21477.8 - 6.0.0-rtm.21477.8 - 6.0.0-rtm.21477.8 - 6.0.0-rtm.21477.8 - 6.0.0-rtm.21477.8 - 6.0.0-rtm.21477.8 + 6.0.0-rtm.21478.11 + 6.0.0-rtm.21478.11 + 6.0.0-rtm.21478.11 + 6.0.0-rtm.21478.11 + 6.0.0-rtm.21478.11 + 6.0.0-rtm.21478.11 2.1.0 @@ -171,7 +171,7 @@ 12.0.100-rc.1.496 15.0.100-rc.1.496 $(MicrosoftNETCoreAppRefPackageVersion) - 6.0.0-rc.2.21464.1 + 6.0.0-rc.2.21474.1 $(MicrosoftNETWorkloadEmscriptenManifest60100Version) From 6f9296086fbc6a91420159ac40e9900d876a41fb Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 29 Sep 2021 13:35:37 +0000 Subject: [PATCH 072/140] Update dependencies from https://github.com/dotnet/sdk build 20210929.9 (#12182) [release/6.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.WindowsDesktop.App.Ref: from 6.0.0-rtm.21477.3 to 6.0.0-rtm.21479.2 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0: from 6.0.0-rtm.21477.3 to 6.0.0-rtm.21479.2 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0: from 6.0.0-rtm.21477.3 to 6.0.0-rtm.21479.2 (parent: Microsoft.NET.Sdk) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.0-rtm.21477.3 to 6.0.0-rtm.21479.2 (parent: Microsoft.NET.Sdk) - Microsoft.Dotnet.WinForms.ProjectTemplates: from 6.0.0-rtm.21477.5 to 6.0.0-rtm.21479.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.0-rtm.21477.3 to 6.0.0-rtm.21479.2 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Wpf.ProjectTemplates: from 6.0.0-rtm.21477.5 to 6.0.0-rtm.21479.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) --- 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 668b56a74..2923c105c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,21 +1,21 @@ - + https://github.com/dotnet/windowsdesktop - 59484487d08260cb60e1e0af6a3aeca9f1856bc1 + a557021e8a5bbd55825f419fff92cd2c7871a213 - + https://github.com/dotnet/windowsdesktop - 59484487d08260cb60e1e0af6a3aeca9f1856bc1 + a557021e8a5bbd55825f419fff92cd2c7871a213 - + https://github.com/dotnet/windowsdesktop - 59484487d08260cb60e1e0af6a3aeca9f1856bc1 + a557021e8a5bbd55825f419fff92cd2c7871a213 - + https://github.com/dotnet/windowsdesktop - 59484487d08260cb60e1e0af6a3aeca9f1856bc1 + a557021e8a5bbd55825f419fff92cd2c7871a213 https://github.com/dotnet/runtime @@ -98,23 +98,23 @@ d1abf4b7bc061aa76afbdf914e318ac07ad9cfcb - + https://github.com/dotnet/sdk - 0dcfbe209d540d3c0846175da646de0dd246d626 + 97786409cabcc25e8bc43fb6e4c2c5d2dd5f0392 - + https://github.com/dotnet/sdk - 0dcfbe209d540d3c0846175da646de0dd246d626 + 97786409cabcc25e8bc43fb6e4c2c5d2dd5f0392 - + https://github.com/dotnet/winforms - 8c8ba989076d4ff3207f35ff5e0fefe0d16fc870 + 5b394be375250b74fe4b87adf76eff875c40400a - + https://github.com/dotnet/wpf - 9adbba1ceeace4af8174707cd71a3cea75142419 + 3182bd4938edda6423c95e7fcc9847dc2b8ab28e https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 5cc6476b4..5ccd28a02 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.0-rtm.21477.5 + 6.0.0-rtm.21479.2 - 6.0.0-rtm.21477.5 + 6.0.0-rtm.21479.2 @@ -56,8 +56,8 @@ - 6.0.100-rtm.21479.6 - 6.0.100-rtm.21479.6 + 6.0.100-rtm.21479.9 + 6.0.100-rtm.21479.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,10 +78,10 @@ - 6.0.0-rtm.21477.3 - 6.0.0-rtm.21477.3 - 6.0.0-rtm.21477.3 - 6.0.0-rtm.21477.3 + 6.0.0-rtm.21479.2 + 6.0.0-rtm.21479.2 + 6.0.0-rtm.21479.2 + 6.0.0-rtm.21479.2 From 6a1786b208458daa29128c4bccfaa504e593991a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 29 Sep 2021 20:55:57 +0000 Subject: [PATCH 073/140] Update dependencies from https://github.com/dotnet/sdk build 20210929.15 (#12191) [release/6.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.DotNet.Common.ItemTemplates: from 6.0.100-rtm.21478.4 to 6.0.100-rtm.21479.2 (parent: Microsoft.NET.Sdk) - Microsoft.TemplateEngine.Cli: from 6.0.100-rtm.21478.4 to 6.0.100-rtm.21479.2 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2923c105c..4faef975a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -89,23 +89,23 @@ c40ef7e056b48e011c43a21354d6790ba6b8b4fc - + https://github.com/dotnet/templating - d1abf4b7bc061aa76afbdf914e318ac07ad9cfcb + 7a9f8e32d7fb80af0767b37b11f0354816805139 - + https://github.com/dotnet/templating - d1abf4b7bc061aa76afbdf914e318ac07ad9cfcb + 7a9f8e32d7fb80af0767b37b11f0354816805139 - + https://github.com/dotnet/sdk - 97786409cabcc25e8bc43fb6e4c2c5d2dd5f0392 + cc43b10716143557350b5a9f18841aae371b5204 - + https://github.com/dotnet/sdk - 97786409cabcc25e8bc43fb6e4c2c5d2dd5f0392 + cc43b10716143557350b5a9f18841aae371b5204 diff --git a/eng/Versions.props b/eng/Versions.props index 5ccd28a02..d59e54f40 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,7 +31,7 @@ - 6.0.100-rtm.21478.4 + 6.0.100-rtm.21479.2 @@ -56,8 +56,8 @@ - 6.0.100-rtm.21479.9 - 6.0.100-rtm.21479.9 + 6.0.100-rtm.21479.15 + 6.0.100-rtm.21479.15 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 045a310d27256dd4eb724d8dca8bdb485eb1b784 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 29 Sep 2021 23:27:51 +0000 Subject: [PATCH 074/140] [release/6.0.1xx] Update dependencies from dotnet/sdk (#12193) [release/6.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.AspNetCore.App.Ref: from 6.0.0-rtm.21478.10 to 6.0.0-rtm.21479.1 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 6.0.0-rtm.21478.10 to 6.0.0-rtm.21479.1 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.0-rtm.21478.10 to 6.0.0-rtm.21479.1 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0: from 6.0.0-rtm.21478.10 to 6.0.0-rtm.21479.1 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 6.0.0-rtm.21478.10 to 6.0.0-rtm.21479.1 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 6.0.0-rtm.21478.10 to 6.0.0-rtm.21479.1 (parent: Microsoft.NET.Sdk) --- 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 4faef975a..33a73ebb4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -51,30 +51,30 @@ https://github.com/dotnet/runtime 9e0a252fd3c5e928973cd08bc1a94ca8dbe7cb84 - + https://github.com/dotnet/aspnetcore - 0168a9d5ef76ea8cf0671ef8af71fd760b7cd16a + 892230b69d93d479c50be1cabf7e868ddc905911 - + https://github.com/dotnet/aspnetcore - 0168a9d5ef76ea8cf0671ef8af71fd760b7cd16a + 892230b69d93d479c50be1cabf7e868ddc905911 - + https://github.com/dotnet/aspnetcore - 0168a9d5ef76ea8cf0671ef8af71fd760b7cd16a + 892230b69d93d479c50be1cabf7e868ddc905911 - + https://github.com/dotnet/aspnetcore - 0168a9d5ef76ea8cf0671ef8af71fd760b7cd16a + 892230b69d93d479c50be1cabf7e868ddc905911 - + https://github.com/dotnet/aspnetcore - 0168a9d5ef76ea8cf0671ef8af71fd760b7cd16a + 892230b69d93d479c50be1cabf7e868ddc905911 - + https://github.com/dotnet/aspnetcore - 0168a9d5ef76ea8cf0671ef8af71fd760b7cd16a + 892230b69d93d479c50be1cabf7e868ddc905911 https://github.com/dotnet/test-templates @@ -98,14 +98,14 @@ 7a9f8e32d7fb80af0767b37b11f0354816805139 - + https://github.com/dotnet/sdk - cc43b10716143557350b5a9f18841aae371b5204 + 7da70396d39b517aa16701b05cd4995b309bef30 - + https://github.com/dotnet/sdk - cc43b10716143557350b5a9f18841aae371b5204 + 7da70396d39b517aa16701b05cd4995b309bef30 diff --git a/eng/Versions.props b/eng/Versions.props index d59e54f40..d1ec4c06a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,20 +44,20 @@ - 6.0.0-rtm.21478.10 - 6.0.0-rtm.21478.10 - 6.0.0-rtm.21478.10 - 6.0.0-rtm.21478.10 - 6.0.0-rtm.21478.10 - 6.0.0-rtm.21478.10 + 6.0.0-rtm.21479.1 + 6.0.0-rtm.21479.1 + 6.0.0-rtm.21479.1 + 6.0.0-rtm.21479.1 + 6.0.0-rtm.21479.1 + 6.0.0-rtm.21479.1 0.2.0 - 6.0.100-rtm.21479.15 - 6.0.100-rtm.21479.15 + 6.0.100-rtm.21479.20 + 6.0.100-rtm.21479.20 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 0eee46be52f0c0e95c5d1c5bf71e993894a2ce40 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 30 Sep 2021 02:15:53 +0000 Subject: [PATCH 075/140] [release/6.0.1xx] Update dependencies from dotnet/sdk (#12197) [release/6.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.NETCore.App.Ref: from 6.0.0-rtm.21478.11 to 6.0.0-rtm.21479.7 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.NetCore.TargetingPack.x64.6.0: from 6.0.0-rtm.21478.11 to 6.0.0-rtm.21479.7 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Runtime.win-x64: from 6.0.0-rtm.21478.11 to 6.0.0-rtm.21479.7 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Host.win-x64: from 6.0.0-rtm.21478.11 to 6.0.0-rtm.21479.7 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.DotNetHostResolver: from 6.0.0-rtm.21478.11 to 6.0.0-rtm.21479.7 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.Platforms: from 6.0.0-rtm.21478.11 to 6.0.0-rtm.21479.7 (parent: Microsoft.NET.Sdk) - Microsoft.Net.Compilers.Toolset: from 4.0.0-5.21478.20 to 4.0.0-5.21479.3 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.0-rtm.21478.11 to 6.0.0-rtm.21479.7 (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 33a73ebb4..9610cd391 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,29 +17,29 @@ https://github.com/dotnet/windowsdesktop a557021e8a5bbd55825f419fff92cd2c7871a213 - + https://github.com/dotnet/runtime - 9e0a252fd3c5e928973cd08bc1a94ca8dbe7cb84 + e013f14c5330375a18656dea8dca14e5602a3ae0 - + https://github.com/dotnet/runtime - 9e0a252fd3c5e928973cd08bc1a94ca8dbe7cb84 + e013f14c5330375a18656dea8dca14e5602a3ae0 - + https://github.com/dotnet/runtime - 9e0a252fd3c5e928973cd08bc1a94ca8dbe7cb84 + e013f14c5330375a18656dea8dca14e5602a3ae0 - + https://github.com/dotnet/runtime - 9e0a252fd3c5e928973cd08bc1a94ca8dbe7cb84 + e013f14c5330375a18656dea8dca14e5602a3ae0 - + https://github.com/dotnet/runtime - 9e0a252fd3c5e928973cd08bc1a94ca8dbe7cb84 + e013f14c5330375a18656dea8dca14e5602a3ae0 - + https://github.com/dotnet/runtime - 9e0a252fd3c5e928973cd08bc1a94ca8dbe7cb84 + e013f14c5330375a18656dea8dca14e5602a3ae0 @@ -47,9 +47,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 9e0a252fd3c5e928973cd08bc1a94ca8dbe7cb84 + e013f14c5330375a18656dea8dca14e5602a3ae0 https://github.com/dotnet/aspnetcore @@ -98,14 +98,14 @@ 7a9f8e32d7fb80af0767b37b11f0354816805139 - + https://github.com/dotnet/sdk - 7da70396d39b517aa16701b05cd4995b309bef30 + 6aeb6544202ccda03721e1f8dff28a9493fb5ceb - + https://github.com/dotnet/sdk - 7da70396d39b517aa16701b05cd4995b309bef30 + 6aeb6544202ccda03721e1f8dff28a9493fb5ceb @@ -135,9 +135,9 @@ linker - + https://github.com/dotnet/roslyn - 99e24c209e8a1436439fc8a0326cca7260e3878f + 75d9802de6e8945c48ac87f964810c90fad97870 diff --git a/eng/Versions.props b/eng/Versions.props index d1ec4c06a..f4e579f58 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,24 +56,24 @@ - 6.0.100-rtm.21479.20 - 6.0.100-rtm.21479.20 + 6.0.100-rtm.21479.30 + 6.0.100-rtm.21479.30 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 6.0.0-rtm.21478.11 + 6.0.0-rtm.21479.7 - 6.0.0-rtm.21478.11 - 6.0.0-rtm.21478.11 - 6.0.0-rtm.21478.11 - 6.0.0-rtm.21478.11 - 6.0.0-rtm.21478.11 - 6.0.0-rtm.21478.11 + 6.0.0-rtm.21479.7 + 6.0.0-rtm.21479.7 + 6.0.0-rtm.21479.7 + 6.0.0-rtm.21479.7 + 6.0.0-rtm.21479.7 + 6.0.0-rtm.21479.7 2.1.0 From 6affb395fa61cd7f2c4f14d8df9b50e4305e307a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 30 Sep 2021 03:27:37 +0000 Subject: [PATCH 076/140] Update dependencies from https://github.com/dotnet/sdk build 20210929.31 (#12200) [release/6.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.AspNetCore.App.Ref: from 6.0.0-rtm.21479.1 to 6.0.0-rtm.21479.12 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 6.0.0-rtm.21479.1 to 6.0.0-rtm.21479.12 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.0-rtm.21479.1 to 6.0.0-rtm.21479.12 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0: from 6.0.0-rtm.21479.1 to 6.0.0-rtm.21479.12 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 6.0.0-rtm.21479.1 to 6.0.0-rtm.21479.12 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 6.0.0-rtm.21479.1 to 6.0.0-rtm.21479.12 (parent: Microsoft.NET.Sdk) --- 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 9610cd391..605654392 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -51,30 +51,30 @@ https://github.com/dotnet/runtime e013f14c5330375a18656dea8dca14e5602a3ae0 - + https://github.com/dotnet/aspnetcore - 892230b69d93d479c50be1cabf7e868ddc905911 + 0267ca57eb58a403624c49105cb647c53786d637 - + https://github.com/dotnet/aspnetcore - 892230b69d93d479c50be1cabf7e868ddc905911 + 0267ca57eb58a403624c49105cb647c53786d637 - + https://github.com/dotnet/aspnetcore - 892230b69d93d479c50be1cabf7e868ddc905911 + 0267ca57eb58a403624c49105cb647c53786d637 - + https://github.com/dotnet/aspnetcore - 892230b69d93d479c50be1cabf7e868ddc905911 + 0267ca57eb58a403624c49105cb647c53786d637 - + https://github.com/dotnet/aspnetcore - 892230b69d93d479c50be1cabf7e868ddc905911 + 0267ca57eb58a403624c49105cb647c53786d637 - + https://github.com/dotnet/aspnetcore - 892230b69d93d479c50be1cabf7e868ddc905911 + 0267ca57eb58a403624c49105cb647c53786d637 https://github.com/dotnet/test-templates @@ -98,14 +98,14 @@ 7a9f8e32d7fb80af0767b37b11f0354816805139 - + https://github.com/dotnet/sdk - 6aeb6544202ccda03721e1f8dff28a9493fb5ceb + 1d1cdf500ba43802f0dc673d09ca4514dd48e7f5 - + https://github.com/dotnet/sdk - 6aeb6544202ccda03721e1f8dff28a9493fb5ceb + 1d1cdf500ba43802f0dc673d09ca4514dd48e7f5 diff --git a/eng/Versions.props b/eng/Versions.props index f4e579f58..82dd62df3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,20 +44,20 @@ - 6.0.0-rtm.21479.1 - 6.0.0-rtm.21479.1 - 6.0.0-rtm.21479.1 - 6.0.0-rtm.21479.1 - 6.0.0-rtm.21479.1 - 6.0.0-rtm.21479.1 + 6.0.0-rtm.21479.12 + 6.0.0-rtm.21479.12 + 6.0.0-rtm.21479.12 + 6.0.0-rtm.21479.12 + 6.0.0-rtm.21479.12 + 6.0.0-rtm.21479.12 0.2.0 - 6.0.100-rtm.21479.30 - 6.0.100-rtm.21479.30 + 6.0.100-rtm.21479.31 + 6.0.100-rtm.21479.31 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From ce9e1e5a59a375854a9b3660f207269d86df4597 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 30 Sep 2021 04:41:21 +0000 Subject: [PATCH 077/140] Update dependencies from https://github.com/dotnet/sdk build 20210929.35 (#12202) [release/6.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.Build: from 17.0.0-preview-21477-04 to 17.0.0-preview-21480-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 605654392..7f3b5015c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,14 +98,14 @@ 7a9f8e32d7fb80af0767b37b11f0354816805139 - + https://github.com/dotnet/sdk - 1d1cdf500ba43802f0dc673d09ca4514dd48e7f5 + 0029b3c89c329e801516a1ad06d2b22693269145 - + https://github.com/dotnet/sdk - 1d1cdf500ba43802f0dc673d09ca4514dd48e7f5 + 0029b3c89c329e801516a1ad06d2b22693269145 @@ -140,9 +140,9 @@ 75d9802de6e8945c48ac87f964810c90fad97870 - + https://github.com/dotnet/msbuild - 3a1e456fe227f3e2b190b434578844c31e8bcb4a + 5805e34696afed9398bc05e2c88e9a9d4f79a4ce diff --git a/eng/Versions.props b/eng/Versions.props index 82dd62df3..53b25537c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.100-rtm.21479.31 - 6.0.100-rtm.21479.31 + 6.0.100-rtm.21479.35 + 6.0.100-rtm.21479.35 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From a18eacdcd80d9eba0b7b504c09c2d259beb2650d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 30 Sep 2021 05:40:07 +0000 Subject: [PATCH 078/140] [release/6.0.1xx] Update dependencies from dotnet/sdk (#12204) [release/6.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.AspNetCore.App.Ref: from 6.0.0-rtm.21479.12 to 6.0.0-rtm.21479.14 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 6.0.0-rtm.21479.12 to 6.0.0-rtm.21479.14 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.0-rtm.21479.12 to 6.0.0-rtm.21479.14 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0: from 6.0.0-rtm.21479.12 to 6.0.0-rtm.21479.14 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 6.0.0-rtm.21479.12 to 6.0.0-rtm.21479.14 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 6.0.0-rtm.21479.12 to 6.0.0-rtm.21479.14 (parent: Microsoft.NET.Sdk) - Microsoft.Net.Compilers.Toolset: from 4.0.0-5.21479.3 to 4.0.0-5.21479.6 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 36 ++++++++++++++++++------------------ eng/Versions.props | 16 ++++++++-------- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7f3b5015c..f32c56920 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -51,30 +51,30 @@ https://github.com/dotnet/runtime e013f14c5330375a18656dea8dca14e5602a3ae0 - + https://github.com/dotnet/aspnetcore - 0267ca57eb58a403624c49105cb647c53786d637 + 9341ccbdabeeb45608ab4287c1d96a5826354601 - + https://github.com/dotnet/aspnetcore - 0267ca57eb58a403624c49105cb647c53786d637 + 9341ccbdabeeb45608ab4287c1d96a5826354601 - + https://github.com/dotnet/aspnetcore - 0267ca57eb58a403624c49105cb647c53786d637 + 9341ccbdabeeb45608ab4287c1d96a5826354601 - + https://github.com/dotnet/aspnetcore - 0267ca57eb58a403624c49105cb647c53786d637 + 9341ccbdabeeb45608ab4287c1d96a5826354601 - + https://github.com/dotnet/aspnetcore - 0267ca57eb58a403624c49105cb647c53786d637 + 9341ccbdabeeb45608ab4287c1d96a5826354601 - + https://github.com/dotnet/aspnetcore - 0267ca57eb58a403624c49105cb647c53786d637 + 9341ccbdabeeb45608ab4287c1d96a5826354601 https://github.com/dotnet/test-templates @@ -98,14 +98,14 @@ 7a9f8e32d7fb80af0767b37b11f0354816805139 - + https://github.com/dotnet/sdk - 0029b3c89c329e801516a1ad06d2b22693269145 + 881779cf80c4959c1054cbdee131452853188b98 - + https://github.com/dotnet/sdk - 0029b3c89c329e801516a1ad06d2b22693269145 + 881779cf80c4959c1054cbdee131452853188b98 @@ -135,9 +135,9 @@ linker - + https://github.com/dotnet/roslyn - 75d9802de6e8945c48ac87f964810c90fad97870 + 91a7a90557a9bd8e8e120d1899f077077c829ce6 diff --git a/eng/Versions.props b/eng/Versions.props index 53b25537c..3850c4a2e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,20 +44,20 @@ - 6.0.0-rtm.21479.12 - 6.0.0-rtm.21479.12 - 6.0.0-rtm.21479.12 - 6.0.0-rtm.21479.12 - 6.0.0-rtm.21479.12 - 6.0.0-rtm.21479.12 + 6.0.0-rtm.21479.14 + 6.0.0-rtm.21479.14 + 6.0.0-rtm.21479.14 + 6.0.0-rtm.21479.14 + 6.0.0-rtm.21479.14 + 6.0.0-rtm.21479.14 0.2.0 - 6.0.100-rtm.21479.35 - 6.0.100-rtm.21479.35 + 6.0.100-rtm.21479.43 + 6.0.100-rtm.21479.43 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 2555a4cb0989c6fb9929822eb0cf053bf761236d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 30 Sep 2021 07:24:32 +0000 Subject: [PATCH 079/140] Update dependencies from https://github.com/dotnet/sdk build 20210929.48 (#12207) [release/6.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.WindowsDesktop.App.Ref: from 6.0.0-rtm.21479.2 to 6.0.0-rtm.21479.3 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0: from 6.0.0-rtm.21479.2 to 6.0.0-rtm.21479.3 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0: from 6.0.0-rtm.21479.2 to 6.0.0-rtm.21479.3 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref: from 6.0.0-rtm.21479.14 to 6.0.0-rtm.21479.16 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 6.0.0-rtm.21479.14 to 6.0.0-rtm.21479.16 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.0-rtm.21479.14 to 6.0.0-rtm.21479.16 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0: from 6.0.0-rtm.21479.14 to 6.0.0-rtm.21479.16 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 6.0.0-rtm.21479.14 to 6.0.0-rtm.21479.16 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 6.0.0-rtm.21479.14 to 6.0.0-rtm.21479.16 (parent: Microsoft.NET.Sdk) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.0-rtm.21479.2 to 6.0.0-rtm.21479.3 (parent: Microsoft.NET.Sdk) - Microsoft.Dotnet.WinForms.ProjectTemplates: from 6.0.0-rtm.21479.2 to 6.0.0-rtm.21479.5 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.0-rtm.21479.2 to 6.0.0-rtm.21479.3 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Wpf.ProjectTemplates: from 6.0.0-rtm.21479.2 to 6.0.0-rtm.21479.6 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) --- eng/Version.Details.xml | 56 ++++++++++++++++++++--------------------- eng/Versions.props | 28 ++++++++++----------- 2 files changed, 42 insertions(+), 42 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f32c56920..c5ddba218 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,21 +1,21 @@ - + https://github.com/dotnet/windowsdesktop - a557021e8a5bbd55825f419fff92cd2c7871a213 + 32beecdf3d588f84d961874a3b0266979966bdc5 - + https://github.com/dotnet/windowsdesktop - a557021e8a5bbd55825f419fff92cd2c7871a213 + 32beecdf3d588f84d961874a3b0266979966bdc5 - + https://github.com/dotnet/windowsdesktop - a557021e8a5bbd55825f419fff92cd2c7871a213 + 32beecdf3d588f84d961874a3b0266979966bdc5 - + https://github.com/dotnet/windowsdesktop - a557021e8a5bbd55825f419fff92cd2c7871a213 + 32beecdf3d588f84d961874a3b0266979966bdc5 https://github.com/dotnet/runtime @@ -51,30 +51,30 @@ https://github.com/dotnet/runtime e013f14c5330375a18656dea8dca14e5602a3ae0 - + https://github.com/dotnet/aspnetcore - 9341ccbdabeeb45608ab4287c1d96a5826354601 + 9cf1aceb713627332683e795f0ec368f767effec - + https://github.com/dotnet/aspnetcore - 9341ccbdabeeb45608ab4287c1d96a5826354601 + 9cf1aceb713627332683e795f0ec368f767effec - + https://github.com/dotnet/aspnetcore - 9341ccbdabeeb45608ab4287c1d96a5826354601 + 9cf1aceb713627332683e795f0ec368f767effec - + https://github.com/dotnet/aspnetcore - 9341ccbdabeeb45608ab4287c1d96a5826354601 + 9cf1aceb713627332683e795f0ec368f767effec - + https://github.com/dotnet/aspnetcore - 9341ccbdabeeb45608ab4287c1d96a5826354601 + 9cf1aceb713627332683e795f0ec368f767effec - + https://github.com/dotnet/aspnetcore - 9341ccbdabeeb45608ab4287c1d96a5826354601 + 9cf1aceb713627332683e795f0ec368f767effec https://github.com/dotnet/test-templates @@ -98,23 +98,23 @@ 7a9f8e32d7fb80af0767b37b11f0354816805139 - + https://github.com/dotnet/sdk - 881779cf80c4959c1054cbdee131452853188b98 + 43608cef78d41775e1267eafae200da1506d6f22 - + https://github.com/dotnet/sdk - 881779cf80c4959c1054cbdee131452853188b98 + 43608cef78d41775e1267eafae200da1506d6f22 - + https://github.com/dotnet/winforms - 5b394be375250b74fe4b87adf76eff875c40400a + bbc039c00b33dd80a30e8564051d9c69ec47eef5 - + https://github.com/dotnet/wpf - 3182bd4938edda6423c95e7fcc9847dc2b8ab28e + ab8e22e9d1e3ac29fa88b9899fc4b02068cb3456 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 3850c4a2e..37607bf04 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.0-rtm.21479.2 + 6.0.0-rtm.21479.5 - 6.0.0-rtm.21479.2 + 6.0.0-rtm.21479.6 @@ -44,20 +44,20 @@ - 6.0.0-rtm.21479.14 - 6.0.0-rtm.21479.14 - 6.0.0-rtm.21479.14 - 6.0.0-rtm.21479.14 - 6.0.0-rtm.21479.14 - 6.0.0-rtm.21479.14 + 6.0.0-rtm.21479.16 + 6.0.0-rtm.21479.16 + 6.0.0-rtm.21479.16 + 6.0.0-rtm.21479.16 + 6.0.0-rtm.21479.16 + 6.0.0-rtm.21479.16 0.2.0 - 6.0.100-rtm.21479.43 - 6.0.100-rtm.21479.43 + 6.0.100-rtm.21479.48 + 6.0.100-rtm.21479.48 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,10 +78,10 @@ - 6.0.0-rtm.21479.2 - 6.0.0-rtm.21479.2 - 6.0.0-rtm.21479.2 - 6.0.0-rtm.21479.2 + 6.0.0-rtm.21479.3 + 6.0.0-rtm.21479.3 + 6.0.0-rtm.21479.3 + 6.0.0-rtm.21479.3 From 58d1050f5116f3d549d45074d5cec4835753acc1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 30 Sep 2021 08:17:17 +0000 Subject: [PATCH 080/140] Update dependencies from https://github.com/dotnet/sdk build 20210929.50 (#12209) [release/6.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.Net.Compilers.Toolset: from 4.0.0-5.21479.6 to 4.0.0-5.21479.8 (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 c5ddba218..87173fa91 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,14 +98,14 @@ 7a9f8e32d7fb80af0767b37b11f0354816805139 - + https://github.com/dotnet/sdk - 43608cef78d41775e1267eafae200da1506d6f22 + be8306eb9d5af13caefe8e56a2423dcfbc931c94 - + https://github.com/dotnet/sdk - 43608cef78d41775e1267eafae200da1506d6f22 + be8306eb9d5af13caefe8e56a2423dcfbc931c94 @@ -135,9 +135,9 @@ linker - + https://github.com/dotnet/roslyn - 91a7a90557a9bd8e8e120d1899f077077c829ce6 + 6e8bb6f10f79579866458d30abcb764d7da9df85 diff --git a/eng/Versions.props b/eng/Versions.props index 37607bf04..f591c5a4c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.100-rtm.21479.48 - 6.0.100-rtm.21479.48 + 6.0.100-rtm.21479.50 + 6.0.100-rtm.21479.50 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 87ce0078bb6293abdccda517938bfcf5f1218e89 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 30 Sep 2021 10:21:04 +0000 Subject: [PATCH 081/140] Update dependencies from https://github.com/dotnet/sdk build 20210930.2 (#12210) [release/6.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.AspNetCore.App.Ref: from 6.0.0-rtm.21479.16 to 6.0.0-rtm.21479.18 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 6.0.0-rtm.21479.16 to 6.0.0-rtm.21479.18 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.0-rtm.21479.16 to 6.0.0-rtm.21479.18 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0: from 6.0.0-rtm.21479.16 to 6.0.0-rtm.21479.18 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 6.0.0-rtm.21479.16 to 6.0.0-rtm.21479.18 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 6.0.0-rtm.21479.16 to 6.0.0-rtm.21479.18 (parent: Microsoft.NET.Sdk) --- 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 87173fa91..61b2ed14a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -51,30 +51,30 @@ https://github.com/dotnet/runtime e013f14c5330375a18656dea8dca14e5602a3ae0 - + https://github.com/dotnet/aspnetcore - 9cf1aceb713627332683e795f0ec368f767effec + 9dabc8d8fca50371c89a09129669e2d1e230dc5e - + https://github.com/dotnet/aspnetcore - 9cf1aceb713627332683e795f0ec368f767effec + 9dabc8d8fca50371c89a09129669e2d1e230dc5e - + https://github.com/dotnet/aspnetcore - 9cf1aceb713627332683e795f0ec368f767effec + 9dabc8d8fca50371c89a09129669e2d1e230dc5e - + https://github.com/dotnet/aspnetcore - 9cf1aceb713627332683e795f0ec368f767effec + 9dabc8d8fca50371c89a09129669e2d1e230dc5e - + https://github.com/dotnet/aspnetcore - 9cf1aceb713627332683e795f0ec368f767effec + 9dabc8d8fca50371c89a09129669e2d1e230dc5e - + https://github.com/dotnet/aspnetcore - 9cf1aceb713627332683e795f0ec368f767effec + 9dabc8d8fca50371c89a09129669e2d1e230dc5e https://github.com/dotnet/test-templates @@ -98,14 +98,14 @@ 7a9f8e32d7fb80af0767b37b11f0354816805139 - + https://github.com/dotnet/sdk - be8306eb9d5af13caefe8e56a2423dcfbc931c94 + cbbeb23ea33ead69b26dc93b411bbd3ad2e2d311 - + https://github.com/dotnet/sdk - be8306eb9d5af13caefe8e56a2423dcfbc931c94 + cbbeb23ea33ead69b26dc93b411bbd3ad2e2d311 diff --git a/eng/Versions.props b/eng/Versions.props index f591c5a4c..c43a7a464 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,20 +44,20 @@ - 6.0.0-rtm.21479.16 - 6.0.0-rtm.21479.16 - 6.0.0-rtm.21479.16 - 6.0.0-rtm.21479.16 - 6.0.0-rtm.21479.16 - 6.0.0-rtm.21479.16 + 6.0.0-rtm.21479.18 + 6.0.0-rtm.21479.18 + 6.0.0-rtm.21479.18 + 6.0.0-rtm.21479.18 + 6.0.0-rtm.21479.18 + 6.0.0-rtm.21479.18 0.2.0 - 6.0.100-rtm.21479.50 - 6.0.100-rtm.21479.50 + 6.0.100-rtm.21480.2 + 6.0.100-rtm.21480.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 521d6bfb21492a65d23c08ba249203a42c5a73b0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 30 Sep 2021 11:12:59 +0000 Subject: [PATCH 082/140] Update dependencies from https://github.com/dotnet/sdk build 20210930.6 (#12211) [release/6.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.DotNet.Common.ItemTemplates: from 6.0.100-rtm.21479.2 to 6.0.100-rtm.21479.3 (parent: Microsoft.NET.Sdk) - Microsoft.TemplateEngine.Cli: from 6.0.100-rtm.21479.2 to 6.0.100-rtm.21479.3 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 61b2ed14a..41529b32d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -89,23 +89,23 @@ c40ef7e056b48e011c43a21354d6790ba6b8b4fc - + https://github.com/dotnet/templating - 7a9f8e32d7fb80af0767b37b11f0354816805139 + 33b3438b8122420b73c8430826222bb0f799f157 - + https://github.com/dotnet/templating - 7a9f8e32d7fb80af0767b37b11f0354816805139 + 33b3438b8122420b73c8430826222bb0f799f157 - + https://github.com/dotnet/sdk - cbbeb23ea33ead69b26dc93b411bbd3ad2e2d311 + 50d84c7c0863ff31052ce4ca40bb4db47df77e49 - + https://github.com/dotnet/sdk - cbbeb23ea33ead69b26dc93b411bbd3ad2e2d311 + 50d84c7c0863ff31052ce4ca40bb4db47df77e49 diff --git a/eng/Versions.props b/eng/Versions.props index c43a7a464..c607ef05e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,7 +31,7 @@ - 6.0.100-rtm.21479.2 + 6.0.100-rtm.21479.3 @@ -56,8 +56,8 @@ - 6.0.100-rtm.21480.2 - 6.0.100-rtm.21480.2 + 6.0.100-rtm.21480.6 + 6.0.100-rtm.21480.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 7504a1d507def8b621477cd474bea8db1c179f91 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 30 Sep 2021 19:30:45 +0000 Subject: [PATCH 083/140] Update dependencies from https://github.com/dotnet/sdk build 20210930.17 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.100-rtm.21480.6 -> To Version 6.0.100-rtm.21480.17 Dependency coherency updates Microsoft.Build From Version 17.0.0-preview-21480-01 -> To Version 17.0.0-preview-21480-03 (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 41529b32d..ee9171273 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,14 +98,14 @@ 33b3438b8122420b73c8430826222bb0f799f157 - + https://github.com/dotnet/sdk - 50d84c7c0863ff31052ce4ca40bb4db47df77e49 + 8b1c55a87ef9af6bf5ac93e06b893c4c4e5b635c - + https://github.com/dotnet/sdk - 50d84c7c0863ff31052ce4ca40bb4db47df77e49 + 8b1c55a87ef9af6bf5ac93e06b893c4c4e5b635c @@ -140,9 +140,9 @@ 6e8bb6f10f79579866458d30abcb764d7da9df85 - + https://github.com/dotnet/msbuild - 5805e34696afed9398bc05e2c88e9a9d4f79a4ce + bbcce1dff18a5c7cb8751ad240e921774b50ebeb diff --git a/eng/Versions.props b/eng/Versions.props index c607ef05e..0907fdb3b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.100-rtm.21480.6 - 6.0.100-rtm.21480.6 + 6.0.100-rtm.21480.17 + 6.0.100-rtm.21480.17 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 2c8037c4e6af9da647115d828f3f17f78ecb6067 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 30 Sep 2021 20:27:17 +0000 Subject: [PATCH 084/140] Update dependencies from https://github.com/dotnet/sdk build 20210930.24 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.100-rtm.21480.6 -> To Version 6.0.100-rtm.21480.24 Dependency coherency updates Microsoft.Build From Version 17.0.0-preview-21480-01 -> To Version 17.0.0-preview-21480-03 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ee9171273..28b58fee5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,14 +98,14 @@ 33b3438b8122420b73c8430826222bb0f799f157 - + https://github.com/dotnet/sdk - 8b1c55a87ef9af6bf5ac93e06b893c4c4e5b635c + 715d34ea0a2d6091a4b7e19ca29af0c084232df4 - + https://github.com/dotnet/sdk - 8b1c55a87ef9af6bf5ac93e06b893c4c4e5b635c + 715d34ea0a2d6091a4b7e19ca29af0c084232df4 diff --git a/eng/Versions.props b/eng/Versions.props index 0907fdb3b..d85bbfbd8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.100-rtm.21480.17 - 6.0.100-rtm.21480.17 + 6.0.100-rtm.21480.24 + 6.0.100-rtm.21480.24 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 4f7a7f370be6056847b004885a2eb70c0f46437c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 30 Sep 2021 21:02:01 +0000 Subject: [PATCH 085/140] Update dependencies from https://github.com/dotnet/sdk build 20210930.28 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.100-rtm.21480.6 -> To Version 6.0.100-rtm.21480.28 Dependency coherency updates Microsoft.Build From Version 17.0.0-preview-21480-01 -> To Version 17.0.0-preview-21480-03 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 28b58fee5..f3d5c26b0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,14 +98,14 @@ 33b3438b8122420b73c8430826222bb0f799f157 - + https://github.com/dotnet/sdk - 715d34ea0a2d6091a4b7e19ca29af0c084232df4 + 685f6d9090d9253aa5dab8340e1583fd57dc309d - + https://github.com/dotnet/sdk - 715d34ea0a2d6091a4b7e19ca29af0c084232df4 + 685f6d9090d9253aa5dab8340e1583fd57dc309d diff --git a/eng/Versions.props b/eng/Versions.props index d85bbfbd8..d45f483d5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.100-rtm.21480.24 - 6.0.100-rtm.21480.24 + 6.0.100-rtm.21480.28 + 6.0.100-rtm.21480.28 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From c2aa7e513e7fd29557569769a31aa7af326b2a3e Mon Sep 17 00:00:00 2001 From: MichaelSimons Date: Fri, 1 Oct 2021 17:20:53 +0000 Subject: [PATCH 086/140] Correcting source-build related merge issues --- eng/Version.Details.xml | 3 +++ ...tReleasesVersion-Versions.props-entr.patch | 6 ++--- ...-externals-when-building-from-source.patch | 25 ------------------- 3 files changed, 6 insertions(+), 28 deletions(-) delete mode 100644 src/SourceBuild/tarball/patches/vstest/0002-Exclude-externals-when-building-from-source.patch diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 955f7d6b1..331e82001 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -20,6 +20,7 @@ https://github.com/dotnet/runtime e013f14c5330375a18656dea8dca14e5602a3ae0 + https://github.com/dotnet/runtime @@ -128,6 +129,7 @@ https://github.com/microsoft/vstest 68bd10d3aee862a9fbb0bac8b3d474bc323024f3 + https://github.com/dotnet/linker @@ -148,6 +150,7 @@ https://github.com/nuget/nuget.client e685bdb6d7b4d1f3664f6542f50b84376a19341c + https://github.com/Microsoft/ApplicationInsights-dotnet diff --git a/src/SourceBuild/tarball/patches/sdk/0001-Rename-DeploymentReleasesVersion-Versions.props-entr.patch b/src/SourceBuild/tarball/patches/sdk/0001-Rename-DeploymentReleasesVersion-Versions.props-entr.patch index 3980fe5f8..007eba94b 100644 --- a/src/SourceBuild/tarball/patches/sdk/0001-Rename-DeploymentReleasesVersion-Versions.props-entr.patch +++ b/src/SourceBuild/tarball/patches/sdk/0001-Rename-DeploymentReleasesVersion-Versions.props-entr.patch @@ -19,11 +19,11 @@ index 0a7442c7c4..741b654ec4 100644 @@ -36,7 +36,7 @@ 4.0.5 5.0.2 - 6.0.0-rc.2.21470.23 + 6.0.0-rtm.21479.7 - 1.0.0-preview1.1.21112.1 + 1.0.0-preview1.1.21112.1 4.6.0 - 2.0.0-beta1.21417.2 + 2.0.0-beta1.21473.1 diff --git a/src/Cli/dotnet/dotnet.csproj b/src/Cli/dotnet/dotnet.csproj index b27862fb9d..539e127a63 100644 @@ -35,7 +35,7 @@ index b27862fb9d..539e127a63 100644 - + - + diff --git a/src/Resolvers/Microsoft.DotNet.MSBuildSdkResolver/Microsoft.DotNet.MSBuildSdkResolver.csproj b/src/Resolvers/Microsoft.DotNet.MSBuildSdkResolver/Microsoft.DotNet.MSBuildSdkResolver.csproj diff --git a/src/SourceBuild/tarball/patches/vstest/0002-Exclude-externals-when-building-from-source.patch b/src/SourceBuild/tarball/patches/vstest/0002-Exclude-externals-when-building-from-source.patch deleted file mode 100644 index ac37ed08b..000000000 --- a/src/SourceBuild/tarball/patches/vstest/0002-Exclude-externals-when-building-from-source.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 9cf491ea8b913b0ec615778e5597584e675f4205 Mon Sep 17 00:00:00 2001 -From: dseefeld -Date: Mon, 13 Sep 2021 21:01:44 +0000 -Subject: [PATCH] Exclude externals when building from source - ---- - src/package/external/external.csproj | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/package/external/external.csproj b/src/package/external/external.csproj -index 036f92ce..9b0e87ad 100644 ---- a/src/package/external/external.csproj -+++ b/src/package/external/external.csproj -@@ -29,7 +29,7 @@ - - - -- -+ - - - --- -2.31.1 - From 7094f386a925f1b91e95aa70fa9025b34fc5dfef Mon Sep 17 00:00:00 2001 From: MichaelSimons Date: Fri, 1 Oct 2021 18:21:43 +0000 Subject: [PATCH 087/140] Disable offline source-build tarball CI --- .../templates/job/source-build-run-tarball-build.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml index a6d2f8690..2d9d06e6d 100644 --- a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml +++ b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml @@ -27,9 +27,10 @@ jobs: Fedora33-Online: _runOnline: true _Container: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-33-20210222183538-031e7d2 - Fedora33-Offline: - _runOnline: false - _Container: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-33-20210222183538-031e7d2 + # Disable until prebuilts are eliminated + # Fedora33-Offline: + # _runOnline: false + # _Container: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-33-20210222183538-031e7d2 timeoutInMinutes: 210 variables: _TarballDir: $(Build.StagingDirectory)/tarball From c5d2414c0faf01b0de9bf53589fe143d10bdf620 Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Fri, 1 Oct 2021 14:36:06 -0500 Subject: [PATCH 088/140] Update source-build prebuilts (#12225) --- eng/Versions.props | 2 +- src/SourceBuild/tarball/content/eng/Versions.props | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index bb83161a0..aad09a72b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -161,7 +161,7 @@ 15.7.179 15.7.179 0.1.0-6.0.100-bootstrap.19 - 0.1.0-6.0.100-23 + 0.1.0-6.0.100-24 diff --git a/src/SourceBuild/tarball/content/eng/Versions.props b/src/SourceBuild/tarball/content/eng/Versions.props index b27697389..d99821dbd 100644 --- a/src/SourceBuild/tarball/content/eng/Versions.props +++ b/src/SourceBuild/tarball/content/eng/Versions.props @@ -23,6 +23,6 @@ 0.1.0-6.0.100-bootstrap.19 0.1.0-6.0.100- - 23 + 24 From c2de8ab3be87100cce0e7f75b40d50c3aa51ca23 Mon Sep 17 00:00:00 2001 From: MichaelSimons Date: Fri, 1 Oct 2021 20:33:37 +0000 Subject: [PATCH 089/140] Disable tarball PR validation leg --- .vsts-ci.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.vsts-ci.yml b/.vsts-ci.yml index 5d0247741..68b45b02a 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -353,10 +353,11 @@ stages: - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball.yml - - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml - parameters: - dependsOn: Source_Build_Create_Tarball - condition: eq(dependencies.Source_Build_Create_Tarball.outputs['Tarball_Build_Check._includeTarballBuild'], 'true') + # Disable until tarball build cleanly + # - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml + # parameters: + # dependsOn: Source_Build_Create_Tarball + # condition: eq(dependencies.Source_Build_Create_Tarball.outputs['Tarball_Build_Check._includeTarballBuild'], 'true') # https://github.com/dotnet/core-sdk/issues/248 # - template: /eng/build.yml From 6bcf16be37ba2e7cbed857f84c9d62b8b5407a2d Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Fri, 1 Oct 2021 16:57:11 -0500 Subject: [PATCH 090/140] [ArPow] Add runtime patch to produce symbol archives (#12220) --- .../0002-Produce-symbols-archives.patch | 42 +++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 src/SourceBuild/tarball/patches/runtime/0002-Produce-symbols-archives.patch diff --git a/src/SourceBuild/tarball/patches/runtime/0002-Produce-symbols-archives.patch b/src/SourceBuild/tarball/patches/runtime/0002-Produce-symbols-archives.patch new file mode 100644 index 000000000..4eb878225 --- /dev/null +++ b/src/SourceBuild/tarball/patches/runtime/0002-Produce-symbols-archives.patch @@ -0,0 +1,42 @@ +From 7577b8cf676f7d38363052e2bc8da931af1cc279 Mon Sep 17 00:00:00 2001 +From: Jeremy Koritzinsky +Date: Thu, 30 Sep 2021 16:04:21 -0700 +Subject: [PATCH] Produce symbols archives. + +Contributes to #49026 + +https://github.com/dotnet/runtime/pull/59843 handles adding the patch to the runtime repo. +--- + .../Microsoft.NETCore.App.Runtime.Composite.sfxproj | 2 +- + .../Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.sfxproj | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.Composite.sfxproj b/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.Composite.sfxproj +index a3f364815d6..5fe3ba42252 100644 +--- a/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.Composite.sfxproj ++++ b/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.Composite.sfxproj +@@ -7,7 +7,7 @@ + dotnet-runtime-internal-composite + $(SharedFrameworkName).Composite + $(SharedFrameworkName).Composite.PGO +- true ++ true + dotnet-runtime-composite-symbols + true + true +diff --git a/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.sfxproj b/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.sfxproj +index 4fa48f4e0c9..1d43304d72b 100644 +--- a/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.sfxproj ++++ b/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.sfxproj +@@ -8,7 +8,7 @@ + dotnet-runtime + dotnet-runtime-internal + $(SharedFrameworkName).PGO +- true ++ true + dotnet-runtime-symbols + NetCore.SharedFramework + true +-- +2.29.2 + From b05fc9c997f410e04887413c26c8a2e4bdde5e32 Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Fri, 1 Oct 2021 18:13:54 -0500 Subject: [PATCH 091/140] [ArPow] Add runtime patch to enable doc generation (#12221) --- eng/Versions.props | 2 +- .../tarball/content/eng/Versions.props | 2 +- src/SourceBuild/tarball/content/smoke-test.sh | 132 ++---------------- ...nable-doc-generation-in-source-build.patch | 25 ++++ 4 files changed, 40 insertions(+), 121 deletions(-) create mode 100644 src/SourceBuild/tarball/patches/runtime/0001-Enable-doc-generation-in-source-build.patch diff --git a/eng/Versions.props b/eng/Versions.props index aad09a72b..dabf241ce 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -161,7 +161,7 @@ 15.7.179 15.7.179 0.1.0-6.0.100-bootstrap.19 - 0.1.0-6.0.100-24 + 0.1.0-6.0.100-25 diff --git a/src/SourceBuild/tarball/content/eng/Versions.props b/src/SourceBuild/tarball/content/eng/Versions.props index d99821dbd..e5a4dd8e0 100644 --- a/src/SourceBuild/tarball/content/eng/Versions.props +++ b/src/SourceBuild/tarball/content/eng/Versions.props @@ -23,6 +23,6 @@ 0.1.0-6.0.100-bootstrap.19 0.1.0-6.0.100- - 24 + 25 diff --git a/src/SourceBuild/tarball/content/smoke-test.sh b/src/SourceBuild/tarball/content/smoke-test.sh index ea2299dde..0617f3f6e 100755 --- a/src/SourceBuild/tarball/content/smoke-test.sh +++ b/src/SourceBuild/tarball/content/smoke-test.sh @@ -466,8 +466,8 @@ function runXmlDocTests() { ) netcoreappIgnoreList=( + mscorlib.xml Microsoft.VisualBasic.xml - netstandard.xml System.AppContext.xml System.Buffers.xml System.ComponentModel.DataAnnotations.xml @@ -482,12 +482,15 @@ function runXmlDocTests() { System.Globalization.Calendars.xml System.Globalization.Extensions.xml System.Globalization.xml + System.IO.Compression.Brotli.xml System.IO.Compression.FileSystem.xml + System.IO.FileSystem.xml System.IO.FileSystem.Primitives.xml System.IO.UnmanagedMemoryStream.xml System.IO.xml System.Net.xml System.Numerics.xml + System.Numerics.Vectors.xml System.Reflection.Extensions.xml System.Reflection.xml System.Resources.Reader.xml @@ -501,6 +504,8 @@ function runXmlDocTests() { System.ServiceModel.Web.xml System.ServiceProcess.xml System.Text.Encoding.xml + System.Text.Json.SourceGeneration.resources.xml + System.Text.Json.SourceGeneration.xml System.Threading.Tasks.Extensions.xml System.Threading.Tasks.xml System.Threading.Timer.xml @@ -513,124 +518,8 @@ function runXmlDocTests() { System.Xml.Serialization.xml System.Xml.xml System.Xml.XmlDocument.xml - Microsoft.CSharp.xml - # Added temporarily due to https://github.com/dotnet/source-build/issues/2404 - Microsoft.VisualBasic.Core.xml - Microsoft.Win32.Primitives.xml - Microsoft.Win32.Registry.xml - System.Collections.Concurrent.xml - System.Collections.Immutable.xml - System.Collections.NonGeneric.xml - System.Collections.Specialized.xml - System.Collections.xml - System.ComponentModel.Annotations.xml - System.ComponentModel.EventBasedAsync.xml - System.ComponentModel.Primitives.xml - System.ComponentModel.TypeConverter.xml - System.ComponentModel.xml - System.Console.xml - System.Data.Common.xml - System.Diagnostics.Contracts.xml - System.Diagnostics.DiagnosticSource.xml - System.Diagnostics.FileVersionInfo.xml - System.Diagnostics.Process.xml - System.Diagnostics.StackTrace.xml - System.Diagnostics.TextWriterTraceListener.xml - System.Diagnostics.TraceSource.xml - System.Diagnostics.Tracing.xml - System.Drawing.Primitives.xml - System.Formats.Asn1.xml - System.IO.Compression.Brotli.xml - System.IO.Compression.ZipFile.xml - System.IO.Compression.xml - System.IO.FileSystem.AccessControl.xml - System.IO.FileSystem.DriveInfo.xml - System.IO.FileSystem.Watcher.xml - System.IO.FileSystem.xml - System.IO.IsolatedStorage.xml - System.IO.MemoryMappedFiles.xml - System.IO.Pipes.AccessControl.xml - System.IO.Pipes.xml - System.Linq.Expressions.xml - System.Linq.Parallel.xml - System.Linq.Queryable.xml - System.Linq.xml - System.Memory.xml - System.Net.Http.Json.xml - System.Net.Http.xml - System.Net.HttpListener.xml - System.Net.Mail.xml - System.Net.NameResolution.xml - System.Net.NetworkInformation.xml - System.Net.Ping.xml - System.Net.Primitives.xml - System.Net.Requests.xml - System.Net.Security.xml - System.Net.ServicePoint.xml - System.Net.Sockets.xml - System.Net.WebClient.xml - System.Net.WebHeaderCollection.xml - System.Net.WebProxy.xml - System.Net.WebSockets.Client.xml - System.Net.WebSockets.xml - System.Numerics.Vectors.xml - System.ObjectModel.xml - System.Reflection.DispatchProxy.xml - System.Reflection.Emit.ILGeneration.xml - System.Reflection.Emit.Lightweight.xml - System.Reflection.Emit.xml - System.Reflection.Metadata.xml - System.Reflection.Primitives.xml - System.Reflection.TypeExtensions.xml - System.Resources.Writer.xml - System.Runtime.CompilerServices.Unsafe.xml - System.Runtime.CompilerServices.VisualC.xml - System.Runtime.InteropServices.RuntimeInformation.xml - System.Runtime.InteropServices.xml - System.Runtime.Intrinsics.xml - System.Runtime.Loader.xml - System.Runtime.Numerics.xml - System.Runtime.Serialization.Formatters.xml - System.Runtime.Serialization.Json.xml - System.Runtime.Serialization.Primitives.xml - System.Runtime.Serialization.Xml.xml - System.Runtime.xml - System.Security.AccessControl.xml - System.Security.Claims.xml - System.Security.Cryptography.Algorithms.xml - System.Security.Cryptography.Cng.xml - System.Security.Cryptography.Csp.xml - System.Security.Cryptography.Encoding.xml - System.Security.Cryptography.OpenSsl.xml - System.Security.Cryptography.Primitives.xml - System.Security.Cryptography.X509Certificates.xml - System.Security.Principal.Windows.xml - System.Text.Encoding.CodePages.xml - System.Text.Encoding.Extensions.xml - System.Text.Encodings.Web.xml - System.Text.Json.xml - System.Text.Json.SourceGeneration.xml - System.Text.Json.SourceGeneration.resources.xml - System.Text.RegularExpressions.xml - System.Threading.Channels.xml - System.Threading.Overlapped.xml - System.Threading.Tasks.Dataflow.xml - System.Threading.Tasks.Parallel.xml - System.Threading.Thread.xml - System.Threading.ThreadPool.xml - System.Threading.xml - System.Transactions.Local.xml - System.Web.HttpUtility.xml - System.Xml.ReaderWriter.xml - System.Xml.XDocument.xml - System.Xml.XPath.XDocument.xml - System.Xml.XPath.xml - System.Xml.XmlSerializer.xml - WindowsBase.xml - mscorlib.xml ) - # Added temporarily due to https://github.com/dotnet/source-build/issues/2404 aspnetcoreappIgnoreList=( Microsoft.AspNetCore.App.Analyzers.xml Microsoft.AspNetCore.App.CodeFixes.xml @@ -660,7 +549,6 @@ function runXmlDocTests() { fi done fi - # Added temporarily due to https://github.com/dotnet/source-build/issues/2404 if [[ "$xmlDocFile" == *"/packs/Microsoft.AspNetCore.App.Ref"* ]]; then xmlFileBasename=$(basename "$xmlDocFile") for ignoreItem in "${aspnetcoreappIgnoreList[@]}"; do @@ -674,10 +562,16 @@ function runXmlDocTests() { error=1 echo "error: missing $xmlDocFile" fi + + if [[ $skip == 1 ]] && [[ -f "$xmlDocFile" ]]; then + error=1 + echo "error: Ignored xml doc was found: $xmlDocFile" + fi + done < <(find "$targetingPacksDir" -name '*.dll' -print0) if [[ $error != 0 ]]; then - echo "error: Missing xml documents" + echo "error: Missing or unexpected xml documents" exit 1 else echo "All expected xml docs are present" diff --git a/src/SourceBuild/tarball/patches/runtime/0001-Enable-doc-generation-in-source-build.patch b/src/SourceBuild/tarball/patches/runtime/0001-Enable-doc-generation-in-source-build.patch new file mode 100644 index 000000000..47c00310d --- /dev/null +++ b/src/SourceBuild/tarball/patches/runtime/0001-Enable-doc-generation-in-source-build.patch @@ -0,0 +1,25 @@ +From 4ca12d74308dceface792dad959bd4a7eda0b1b4 Mon Sep 17 00:00:00 2001 +From: MichaelSimons +Date: Thu, 30 Sep 2021 22:37:24 +0000 +Subject: [PATCH] Enable doc generation in source-build + +--- + Build.proj | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Build.proj b/Build.proj +index bff94b97a7a..5f47e869fb6 100644 +--- a/Build.proj ++++ b/Build.proj +@@ -10,7 +10,7 @@ + + + +- ++ + + + Date: Fri, 1 Oct 2021 20:37:05 -0500 Subject: [PATCH 092/140] [ArPow] Add option to bootstrap previously source-built packages (#12222) * Add option to bootstrap previously source-built packages This option modifies the previously source-built archive to include portable packages that are downloaded from a microsoft official feed rather than source-built. * Remove working directory * Add newlines * Add additional comment about feeds * Update source-build prebuilts * Remove original archive rather than backup Co-authored-by: MichaelSimons --- src/SourceBuild/tarball/content/prep.sh | 38 +- .../buildBootstrapPreviouslySB.csproj | 61 +++ .../scripts/bootstrap/buildbootstrapcli.sh | 411 ------------------ 3 files changed, 98 insertions(+), 412 deletions(-) create mode 100644 src/SourceBuild/tarball/content/scripts/bootstrap/buildBootstrapPreviouslySB.csproj delete mode 100755 src/SourceBuild/tarball/content/scripts/bootstrap/buildbootstrapcli.sh diff --git a/src/SourceBuild/tarball/content/prep.sh b/src/SourceBuild/tarball/content/prep.sh index 794a108d2..9e749fc2b 100755 --- a/src/SourceBuild/tarball/content/prep.sh +++ b/src/SourceBuild/tarball/content/prep.sh @@ -5,13 +5,18 @@ IFS=$'\n\t' SCRIPT_ROOT="$(cd -P "$( dirname "$0" )" && pwd)" usage() { - echo "usage: $0" + echo "usage: $0 [options]" echo "" echo " Prepares a tarball to be built by downloading Private.SourceBuilt.Artifacts.*.tar.gz and" echo " installing the version of dotnet referenced in global.json" + echo "options:" + echo " --bootstrap Build a bootstrap version of previously source-built packages archive." + echo " This modifies the downloaded version, replacing portable packages" + echo " with official ms-built packages restored from package feeds." echo "" } +buildBootstrap=false positional_args=() while :; do if [ $# -le 0 ]; then @@ -23,6 +28,9 @@ while :; do usage exit 0 ;; + --bootstrap) + buildBootstrap=true + ;; *) positional_args+=("$1") ;; @@ -87,3 +95,31 @@ if [ "$installDotnet" == "true" ]; then echo " Installing dotnet..." (source ./eng/common/tools.sh && InitializeDotNetCli true) fi + +# Build bootstrap, if specified +if [ "$buildBootstrap" == "true" ]; then + DOTNET_SDK_PATH="$SCRIPT_ROOT/.dotnet" + + # Create working directory for running bootstrap project + workingDir=$(mktemp -d) + echo " Building bootstrap previously source-built in $workingDir" + + # Copy bootstrap project to working dir + cp $SCRIPT_ROOT/scripts/bootstrap/buildBootstrapPreviouslySB.csproj $workingDir + + # Copy NuGet.config from the installer repo to have the right feeds + cp $SCRIPT_ROOT/src/installer.*/NuGet.config $workingDir + + # Get PackageVersions.props from existing prev-sb archive + echo " Retrieving PackageVersions.props from existing archive" + sourceBuiltArchive=`find $SCRIPT_ROOT/packages/archive -maxdepth 1 -name 'Private.SourceBuilt.Artifacts*.tar.gz'` + if [ -f "$sourceBuiltArchive" ]; then + tar -xzf "$sourceBuiltArchive" -C $workingDir PackageVersions.props + fi + + # Run restore on project to initiate download of bootstrap packages + $DOTNET_SDK_PATH/dotnet restore $workingDir/buildBootstrapPreviouslySB.csproj /bl /p:ArchiveDir="$SCRIPT_ROOT/packages/archive/" + + # Remove working directory + rm -rf $workingDir +fi diff --git a/src/SourceBuild/tarball/content/scripts/bootstrap/buildBootstrapPreviouslySB.csproj b/src/SourceBuild/tarball/content/scripts/bootstrap/buildBootstrapPreviouslySB.csproj new file mode 100644 index 000000000..090db5fbf --- /dev/null +++ b/src/SourceBuild/tarball/content/scripts/bootstrap/buildBootstrapPreviouslySB.csproj @@ -0,0 +1,61 @@ + + + + + + + net6.0 + $(MSBuildProjectDirectory)/artifacts/ + $(MSBuildProjectDirectory)/artifacts/restoredPkgs/ + $(MSBuildProjectDirectory)/artifacts/unpacked/ + $(ArchiveDir)Private.SourceBuilt.Artifacts.Bootstrap.tar.gz + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/SourceBuild/tarball/content/scripts/bootstrap/buildbootstrapcli.sh b/src/SourceBuild/tarball/content/scripts/bootstrap/buildbootstrapcli.sh deleted file mode 100755 index b27b5476e..000000000 --- a/src/SourceBuild/tarball/content/scripts/bootstrap/buildbootstrapcli.sh +++ /dev/null @@ -1,411 +0,0 @@ -#!/usr/bin/env bash -set -e -set -u -set -o pipefail - -usage() -{ - echo "Builds a bootstrap CLI from sources" - echo "Usage: $0 [BuildType] -rid -seedcli [-os ] [-clang ] [-corelib ]" - echo "" - echo "Options:" - echo " BuildType Type of build (-debug, -release), default: -release" - echo " -clang Override of the version of clang compiler to use" - echo " -corelib Path to System.Private.CoreLib.dll, default: use the System.Private.CoreLib.dll from the seed CLI" - echo " -os Operating system (used for corefx build), default: Linux" - echo " -rid Runtime identifier including the architecture part (e.g. rhel.6-x64)" - echo " -seedcli Seed CLI used to generate the target CLI" - echo " -outputpath Optional output directory to contain the generated cli and cloned repos, default: " -} - -disable_pax_mprotect() -{ - if [[ $(command -v paxctl) ]]; then - paxctl -c -m $1 - fi -} - -get_max_version() -{ - local maxversionhi=0 - local maxversionmid=0 - local maxversionlo=0 - local maxversiontag - local versionrest - local versionhi - local versionmid - local versionlo - local versiontag - local foundmax - - for d in $1/*; do - - if [[ -d $d ]]; then - versionrest=$(basename $d) - versionhi=${versionrest%%.*} - versionrest=${versionrest#*.} - versionmid=${versionrest%%.*} - versionrest=${versionrest#*.} - versionlo=${versionrest%%-*} - versiontag=${versionrest#*-} - if [[ $versiontag == $versionrest ]]; then - versiontag="" - fi - - foundmax=0 - - if [[ $versionhi -gt $maxversionhi ]]; then - foundmax=1 - elif [[ $versionhi -eq $maxversionhi ]]; then - if [[ $versionmid -gt $maxversionmid ]]; then - foundmax=1 - elif [[ $versionmid -eq $maxversionmid ]]; then - if [[ $versionlo -gt $maxversionlo ]]; then - foundmax=1 - elif [[ $versionlo -eq $maxversionlo ]]; then - # tags are used to mark pre-release versions, so a version without a tag - # is newer than a version with one. - if [[ "$versiontag" == "" || $versiontag > $maxversiontag ]]; then - foundmax=1 - fi - fi - fi - fi - - if [[ $foundmax != 0 ]]; then - maxversionhi=$versionhi - maxversionmid=$versionmid - maxversionlo=$versionlo - maxversiontag=$versiontag - fi - fi - done - - echo $maxversionhi.$maxversionmid.$maxversionlo${maxversiontag:+-$maxversiontag} -} - -getrealpath() -{ - if command -v realpath > /dev/null; then - realpath $1 - else - readlink -e $1 - fi -} - -__build_os=Linux -__runtime_id= -__corelib= -__configuration=release -__clangversion= -__outputpath= - -while [[ "${1:-}" != "" ]]; do - lowerI="$(echo $1 | awk '{print tolower($0)}')" - case $lowerI in - -h|--help) - usage - exit 1 - ;; - -rid) - shift - __runtime_id=$1 - ;; - -os) - shift - __build_os=$1 - ;; - -debug) - __configuration=debug - ;; - -release) - __configuration=release - ;; - -corelib) - shift - __corelib=`getrealpath $1` - ;; - -seedcli) - shift - __seedclipath=`getrealpath $1` - ;; - -clang) - shift - __clangversion=clang$1 - ;; - -outputpath) - shift - __outputpath=$1 - ;; - *) - echo "Unknown argument to build.sh $1"; exit 1 - esac - shift -done - - -if [[ -z "$__runtime_id" ]]; then - echo "Missing the required -rid argument" - exit 2 -fi - -if [[ -z "$__seedclipath" ]]; then - echo "Missing the required -seedcli argument" - exit 3 -fi - -__build_arch=${__runtime_id#*-} - -if [[ -z "$__outputpath" ]]; then - __outputpath=$__runtime_id/dotnetcli -fi - -if [[ -d "$__outputpath" ]]; then - /bin/rm -r $__outputpath -fi - -mkdir -p $__runtime_id -mkdir -p $__outputpath - -__outputpath=`getrealpath $__outputpath` - -cd $__runtime_id - -cp -r $__seedclipath/* $__outputpath - -__frameworkversion="2.0.0" -__sdkversion="2.0.0" -__fxrversion="2.0.0" - -echo "**** DETECTING VERSIONS IN SEED CLI ****" - -__frameworkversion=`get_max_version $__seedclipath/shared/Microsoft.NETCore.App` -__sdkversion=`get_max_version $__seedclipath/sdk` -__fxrversion=`get_max_version $__seedclipath/host/fxr` - -echo "Framework version: $__frameworkversion" -echo "SDK version: $__sdkversion" -echo "FXR version: $__fxrversion" - -__frameworkpath=$__outputpath/shared/Microsoft.NETCore.App/$__frameworkversion - -echo "**** DETECTING GIT COMMIT HASHES ****" - -# Extract the git commit hashes representig the state of the three repos that -# the seed cli package was built from -__coreclrhash=`strings $__seedclipath/shared/Microsoft.NETCore.App/$__frameworkversion/libcoreclr.so | grep "@(#)" | grep -o "[a-f0-9]\{40\}"` -__corefxhash=`strings $__seedclipath/shared/Microsoft.NETCore.App/$__frameworkversion/System.Native.so | grep "@(#)" | grep -o "[a-f0-9]\{40\}"` -__coresetuphash=`strings $__seedclipath/dotnet | grep "@(#)" | grep -o "[a-f0-9]\{40\}"` -if [[ "$__coresetuphash" == "" ]]; then - __coresetuphash=`strings $__seedclipath/dotnet | grep -o "[a-f0-9]\{40\}"` -fi - -echo "coreclr hash: $__coreclrhash" -echo "corefx hash: $__corefxhash" -echo "core-setup hash: $__coresetuphash" - -# Clone the three repos if they were not cloned yet. If the folders already -# exist, leave them alone. This allows patching the cloned sources as needed - -if [[ ! -d coreclr ]]; then - echo "**** CLONING CORECLR REPOSITORY ****" - git clone https://github.com/dotnet/coreclr.git - cd coreclr - git checkout $__coreclrhash - cd .. -fi - -if [[ ! -d corefx ]]; then - echo "**** CLONING COREFX REPOSITORY ****" - git clone https://github.com/dotnet/corefx.git - cd corefx - git checkout $__corefxhash - cd .. -fi - -if [[ ! -d core-setup ]]; then - echo "**** CLONING CORE-SETUP REPOSITORY ****" - git clone https://github.com/dotnet/core-setup.git - cd core-setup - git checkout $__coresetuphash - cd .. -fi - -echo "**** BUILDING CORE-SETUP NATIVE COMPONENTS ****" -cd core-setup -src/corehost/build.sh --configuration $__configuration --arch "$__build_arch" --hostver "2.0.0" --apphostver "2.0.0" --fxrver "2.0.0" --policyver "2.0.0" --commithash `git rev-parse HEAD` -cd .. - -echo "**** BUILDING CORECLR NATIVE COMPONENTS ****" -cd coreclr -./build.sh $__configuration $__build_arch $__clangversion -skipgenerateversion -skipmanaged -skipmscorlib -skiprestore -skiprestoreoptdata -skipnuget -nopgooptimize 2>&1 | tee coreclr.log -export __coreclrbin=$(cat coreclr.log | sed -n -e 's/^.*Product binaries are available at //p') -cd .. -echo "CoreCLR binaries will be copied from $__coreclrbin" - -echo "**** BUILDING COREFX NATIVE COMPONENTS ****" -corefx/src/Native/build-native.sh $__build_arch $__configuration $__clangversion $__build_os 2>&1 | tee corefx.log -export __corefxbin=$(cat corefx.log | sed -n -e 's/^.*Build files have been written to: //p') -echo "CoreFX binaries will be copied from $__corefxbin" - -echo "**** Copying new binaries to dotnetcli/ ****" - -# First copy the coreclr repo binaries -cp $__coreclrbin/*so $__frameworkpath -cp $__coreclrbin/corerun $__frameworkpath -cp $__coreclrbin/crossgen $__frameworkpath - -# Mark the coreclr executables as allowed to create executable memory mappings -disable_pax_mprotect $__frameworkpath/corerun -disable_pax_mprotect $__frameworkpath/crossgen - -# Now copy the core-setup repo binaries - -if [[ $__fxrversion == 2* ]]; then - cp core-setup/cli/exe/dotnet/dotnet $__outputpath - cp core-setup/cli/exe/dotnet/dotnet $__frameworkpath/corehost - - cp core-setup/cli/dll/libhostpolicy.so $__frameworkpath - cp core-setup/cli/dll/libhostpolicy.so $__outputpath/sdk/$__sdkversion - - cp core-setup/cli/fxr/libhostfxr.so $__frameworkpath - cp core-setup/cli/fxr/libhostfxr.so $__outputpath/host/fxr/$__fxrversion - cp core-setup/cli/fxr/libhostfxr.so $__outputpath/sdk/$__sdkversion -else - cp core-setup/bin/$__runtime_id.$__configuration/corehost/dotnet $__outputpath - cp core-setup/bin/$__runtime_id.$__configuration/corehost/dotnet $__frameworkpath/corehost - - cp core-setup/bin/$__runtime_id.$__configuration/corehost/libhostpolicy.so $__frameworkpath - cp core-setup/bin/$__runtime_id.$__configuration/corehost/libhostpolicy.so $__outputpath/sdk/$__sdkversion - - cp core-setup/bin/$__runtime_id.$__configuration/corehost/libhostfxr.so $__frameworkpath - cp core-setup/bin/$__runtime_id.$__configuration/corehost/libhostfxr.so $__outputpath/host/fxr/$__fxrversion - cp core-setup/bin/$__runtime_id.$__configuration/corehost/libhostfxr.so $__outputpath/sdk/$__sdkversion -fi - -# Mark the core-setup executables as allowed to create executable memory mappings -disable_pax_mprotect $__outputpath/dotnet -disable_pax_mprotect $__frameworkpath/corehost - -# Finally copy the corefx repo binaries -cp $__corefxbin/**/System.* $__frameworkpath - -# Copy System.Private.CoreLib.dll override from somewhere if requested -if [[ "$__corelib" != "" ]]; then - cp "$__corelib" $__frameworkpath -fi - -# Add the new RID to Microsoft.NETCore.App.deps.json -# Replace the linux-x64 RID in the target, runtimeTarget and runtimes by the new RID -# and add the new RID to the list of runtimes. -echo "**** Adding new rid to Microsoft.NETCore.App.deps.json ****" - -#TODO: add parameter with the parent RID sequence - -sed \ - -e 's/runtime\.linux-x64/runtime.'$__runtime_id'/g' \ - -e 's/runtimes\/linux-x64/runtimes\/'$__runtime_id'/g' \ - -e 's/Version=v\([0-9].[0-9]\)\/linux-x64/Version=v\1\/'$__runtime_id'/g' \ -$__seedclipath/shared/Microsoft.NETCore.App/$__frameworkversion/Microsoft.NETCore.App.deps.json \ ->$__frameworkpath/Microsoft.NETCore.App.deps.json - -# add the new RID to the list of runtimes iff it does not already exist (sed inplace) -__os_dependencies= -if [[ $__build_os == "Linux" ]]; then - __os_dependencies='"linux", "linux-'$__build_arch'", ' -fi -grep -q "\"$__runtime_id\":" $__frameworkpath/Microsoft.NETCore.App.deps.json || \ -sed -i \ - -e 's/"runtimes": {/&\n "'$__runtime_id'": [\n '"$__os_dependencies"'"unix", "unix-'$__build_arch'", "any", "base"\n ],/g' \ -$__frameworkpath/Microsoft.NETCore.App.deps.json - -__crossgentimeout=120 - -function crossgenone(){ - echo $2/crossgen /MissingDependenciesOK /Platform_Assemblies_Paths $2:$3 /in $1 /out $1.ni >$1.log 2>&1 - timeout $__crossgentimeout $2/crossgen /MissingDependenciesOK /Platform_Assemblies_Paths $2:$3 /in $1 /out $1.ni >>$1.log 2>&1 - exitCode=$? - if [ "$exitCode" == "0" ] - then - rm $1.log - mv $1.ni $1 - elif grep -q -e 'The module was expected to contain an assembly manifest' \ - -e 'An attempt was made to load a program with an incorrect format.' \ - -e 'File is PE32' $1.log - then - rm $1.log - echo "$1" >> crossgenskipped - else - echo "$1" >> crossgenretry - fi -} - -# Run an assembly through ildasm ilasm roundtrip to remove x64 crossgen -function uncrossgenone(){ - echo >> $1.log 2>&1 - echo mv $1 $1.x64 >> $1.log 2>&1 - echo $2/ildasm -raweh -out=$1.il $1.x64 "&& \\" >> $1.log 2>&1 - echo $2/ilasm -output=$1 -QUIET -NOLOGO -DEBUG -OPTIMIZE $1.il >> $1.log 2>&1 - - mv $1 $1.x64 - $2/ildasm -raweh -out=$1.il $1.x64 && \ - $2/ilasm -output=$1 -DLL -QUIET -NOLOGO -DEBUG -OPTIMIZE $1.il - exitCode=$? - if [ "$exitCode" == "0" ] - then - rm $1.x64 - rm $1.il - else - echo "$1" >> uncrossgenfails - fi -} - -# if $__build_arch is not x64 then any dll which was crossgened for x64 must be recrossgened for $__build_arch -if [[ "$__build_arch" != "x64" ]] -then - echo "**** Beginning crossgen for $__build_arch target ****" - export -f crossgenone - export __crossgentimeout - - rm -f crossgenretry crossgendlls crossgenskipped uncrossgenfails - - # Assumes System.Private.CoreLib was already crossgened - find $__outputpath -type f -name \*.dll -or -name \*.exe | grep -v System.Private.CoreLib > crossgendlls - - cat crossgendlls | xargs -P 0 -n 1 -I {} bash -c 'crossgenone "$@"' _ {} "$__frameworkpath" "$__outputpath/sdk/$__sdkversion" - - echo - echo "**** Crossgen skipped for non-managed assembly files:" - echo - - touch crossgenskipped - cat crossgenskipped - - echo - echo "**** Crossgen failed for the following dlls:" - echo - - touch crossgenretry - cat crossgenretry - - echo - echo "**** Beginning uncrossgen for failed dlls ****" - echo - export -f uncrossgenone - - rm -f $__coreclrbin/System.Private.CoreLib.dll - ln -s $__corelib $__coreclrbin/System.Private.CoreLib.dll - - cat crossgenretry | xargs -P 0 -n 1 -I {} bash -c 'uncrossgenone "$@"' _ {} "$__coreclrbin" - - rm -f $__coreclrbin/System.Private.CoreLib.dll - - echo - echo "**** Uncrossgen failed for the following dlls:" - echo - touch uncrossgenfails - cat uncrossgenfails -fi - -echo "**** Bootstrap CLI was successfully built ****" - From 4a7913e7af801e414cbc7821cd375e8c35086523 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 4 Oct 2021 13:15:14 +0000 Subject: [PATCH 093/140] [release/6.0.1xx] Update dependencies from dotnet/sdk (#12219) [release/6.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.WindowsDesktop.App.Ref: from 6.0.0-rtm.21479.3 to 6.0.0-rtm.21501.4 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0: from 6.0.0-rtm.21479.3 to 6.0.0-rtm.21501.4 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0: from 6.0.0-rtm.21479.3 to 6.0.0-rtm.21501.4 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Ref: from 6.0.0-rtm.21479.7 to 6.0.0-rtm.21501.9 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.NetCore.TargetingPack.x64.6.0: from 6.0.0-rtm.21479.7 to 6.0.0-rtm.21501.9 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Runtime.win-x64: from 6.0.0-rtm.21479.7 to 6.0.0-rtm.21501.9 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Host.win-x64: from 6.0.0-rtm.21479.7 to 6.0.0-rtm.21501.9 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.DotNetHostResolver: from 6.0.0-rtm.21479.7 to 6.0.0-rtm.21501.9 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.Platforms: from 6.0.0-rtm.21479.7 to 6.0.0-rtm.21501.9 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref: from 6.0.0-rtm.21479.18 to 6.0.0-rtm.21501.15 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 6.0.0-rtm.21479.18 to 6.0.0-rtm.21501.15 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.0-rtm.21479.18 to 6.0.0-rtm.21501.15 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0: from 6.0.0-rtm.21479.18 to 6.0.0-rtm.21501.15 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 6.0.0-rtm.21479.18 to 6.0.0-rtm.21501.15 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 6.0.0-rtm.21479.18 to 6.0.0-rtm.21501.15 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Common.ItemTemplates: from 6.0.100-rtm.21479.3 to 6.0.100-rtm.21501.8 (parent: Microsoft.NET.Sdk) - Microsoft.TemplateEngine.Cli: from 6.0.100-rtm.21479.3 to 6.0.100-rtm.21501.8 (parent: Microsoft.NET.Sdk) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.0-rtm.21479.3 to 6.0.0-rtm.21501.4 (parent: Microsoft.NET.Sdk) - Microsoft.Dotnet.WinForms.ProjectTemplates: from 6.0.0-rtm.21479.5 to 6.0.0-rtm.21501.5 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.0-rtm.21479.3 to 6.0.0-rtm.21501.4 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Wpf.ProjectTemplates: from 6.0.0-rtm.21479.6 to 6.0.0-rtm.21501.4 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.FSharp.Compiler: from 12.0.0-beta.21477.4 to 12.0.0-beta.21501.2 (parent: Microsoft.NET.Sdk) - Microsoft.SourceBuild.Intermediate.fsharp: from 6.0.0-beta.21477.4 to 6.0.0-beta.21501.2 (parent: Microsoft.NET.Sdk) - Microsoft.Net.Compilers.Toolset: from 4.0.0-5.21479.8 to 4.0.0-5.21501.19 (parent: Microsoft.NET.Sdk) - Microsoft.Build: from 17.0.0-preview-21480-03 to 17.0.0-preview-21501-01 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.0-rtm.21479.7 to 6.0.0-rtm.21501.9 (parent: Microsoft.NET.Sdk) - Update Docker image used in CI to fix cert issue (#12226) --- eng/Version.Details.xml | 106 +++++++++++++++++------------------ eng/Versions.props | 44 +++++++-------- eng/docker/debian/Dockerfile | 2 +- 3 files changed, 76 insertions(+), 76 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f3d5c26b0..3e3377266 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,45 +1,45 @@ - + https://github.com/dotnet/windowsdesktop - 32beecdf3d588f84d961874a3b0266979966bdc5 + 4a370044ea3502b4b1e88878084da989b3d33fb4 - + https://github.com/dotnet/windowsdesktop - 32beecdf3d588f84d961874a3b0266979966bdc5 + 4a370044ea3502b4b1e88878084da989b3d33fb4 - + https://github.com/dotnet/windowsdesktop - 32beecdf3d588f84d961874a3b0266979966bdc5 + 4a370044ea3502b4b1e88878084da989b3d33fb4 - + https://github.com/dotnet/windowsdesktop - 32beecdf3d588f84d961874a3b0266979966bdc5 + 4a370044ea3502b4b1e88878084da989b3d33fb4 - + https://github.com/dotnet/runtime - e013f14c5330375a18656dea8dca14e5602a3ae0 + 6c5c32d56ec74280783664c2526937d23cfc3467 - + https://github.com/dotnet/runtime - e013f14c5330375a18656dea8dca14e5602a3ae0 + 6c5c32d56ec74280783664c2526937d23cfc3467 - + https://github.com/dotnet/runtime - e013f14c5330375a18656dea8dca14e5602a3ae0 + 6c5c32d56ec74280783664c2526937d23cfc3467 - + https://github.com/dotnet/runtime - e013f14c5330375a18656dea8dca14e5602a3ae0 + 6c5c32d56ec74280783664c2526937d23cfc3467 - + https://github.com/dotnet/runtime - e013f14c5330375a18656dea8dca14e5602a3ae0 + 6c5c32d56ec74280783664c2526937d23cfc3467 - + https://github.com/dotnet/runtime - e013f14c5330375a18656dea8dca14e5602a3ae0 + 6c5c32d56ec74280783664c2526937d23cfc3467 @@ -47,34 +47,34 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - e013f14c5330375a18656dea8dca14e5602a3ae0 + 6c5c32d56ec74280783664c2526937d23cfc3467 - + https://github.com/dotnet/aspnetcore - 9dabc8d8fca50371c89a09129669e2d1e230dc5e + ff24fca527d18e0bae90922e147c6a08c54da235 - + https://github.com/dotnet/aspnetcore - 9dabc8d8fca50371c89a09129669e2d1e230dc5e + ff24fca527d18e0bae90922e147c6a08c54da235 - + https://github.com/dotnet/aspnetcore - 9dabc8d8fca50371c89a09129669e2d1e230dc5e + ff24fca527d18e0bae90922e147c6a08c54da235 - + https://github.com/dotnet/aspnetcore - 9dabc8d8fca50371c89a09129669e2d1e230dc5e + ff24fca527d18e0bae90922e147c6a08c54da235 - + https://github.com/dotnet/aspnetcore - 9dabc8d8fca50371c89a09129669e2d1e230dc5e + ff24fca527d18e0bae90922e147c6a08c54da235 - + https://github.com/dotnet/aspnetcore - 9dabc8d8fca50371c89a09129669e2d1e230dc5e + ff24fca527d18e0bae90922e147c6a08c54da235 https://github.com/dotnet/test-templates @@ -89,40 +89,40 @@ c40ef7e056b48e011c43a21354d6790ba6b8b4fc - + https://github.com/dotnet/templating - 33b3438b8122420b73c8430826222bb0f799f157 + e3ad8b07978395c14ed697535186fcc3222dc7a0 - + https://github.com/dotnet/templating - 33b3438b8122420b73c8430826222bb0f799f157 + e3ad8b07978395c14ed697535186fcc3222dc7a0 - + https://github.com/dotnet/sdk - 685f6d9090d9253aa5dab8340e1583fd57dc309d + 1cdf7c79a3d0e65093cb5821ba0406f8b2aecd54 - + https://github.com/dotnet/sdk - 685f6d9090d9253aa5dab8340e1583fd57dc309d + 1cdf7c79a3d0e65093cb5821ba0406f8b2aecd54 - + https://github.com/dotnet/winforms - bbc039c00b33dd80a30e8564051d9c69ec47eef5 + bc7b7501bd2815808d58db2657519c896aab1524 - + https://github.com/dotnet/wpf - ab8e22e9d1e3ac29fa88b9899fc4b02068cb3456 + 1fa418e6138b3047577d506af5335cabeb58e6ec - + https://github.com/dotnet/fsharp - 470cfa0155392abb4727a32f0906c9b3d418e33d + 6b04aa963d40befe43469d8f00172082ce959323 - + https://github.com/dotnet/fsharp - 470cfa0155392abb4727a32f0906c9b3d418e33d + 6b04aa963d40befe43469d8f00172082ce959323 @@ -135,12 +135,12 @@ linker - + https://github.com/dotnet/roslyn - 6e8bb6f10f79579866458d30abcb764d7da9df85 + 8e1779e16298415843e85029d8b52a1ae9bb4c30 - + https://github.com/dotnet/msbuild bbcce1dff18a5c7cb8751ad240e921774b50ebeb diff --git a/eng/Versions.props b/eng/Versions.props index d45f483d5..337cba236 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,15 +23,15 @@ - 6.0.0-rtm.21479.5 + 6.0.0-rtm.21501.5 - 6.0.0-rtm.21479.6 + 6.0.0-rtm.21501.4 - 6.0.100-rtm.21479.3 + 6.0.100-rtm.21501.8 @@ -44,44 +44,44 @@ - 6.0.0-rtm.21479.18 - 6.0.0-rtm.21479.18 - 6.0.0-rtm.21479.18 - 6.0.0-rtm.21479.18 - 6.0.0-rtm.21479.18 - 6.0.0-rtm.21479.18 + 6.0.0-rtm.21501.15 + 6.0.0-rtm.21501.15 + 6.0.0-rtm.21501.15 + 6.0.0-rtm.21501.15 + 6.0.0-rtm.21501.15 + 6.0.0-rtm.21501.15 0.2.0 - 6.0.100-rtm.21480.28 - 6.0.100-rtm.21480.28 + 6.0.100-rtm.21503.6 + 6.0.100-rtm.21503.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 6.0.0-rtm.21479.7 + 6.0.0-rtm.21501.9 - 6.0.0-rtm.21479.7 - 6.0.0-rtm.21479.7 - 6.0.0-rtm.21479.7 - 6.0.0-rtm.21479.7 - 6.0.0-rtm.21479.7 - 6.0.0-rtm.21479.7 + 6.0.0-rtm.21501.9 + 6.0.0-rtm.21501.9 + 6.0.0-rtm.21501.9 + 6.0.0-rtm.21501.9 + 6.0.0-rtm.21501.9 + 6.0.0-rtm.21501.9 2.1.0 - 6.0.0-rtm.21479.3 - 6.0.0-rtm.21479.3 - 6.0.0-rtm.21479.3 - 6.0.0-rtm.21479.3 + 6.0.0-rtm.21501.4 + 6.0.0-rtm.21501.4 + 6.0.0-rtm.21501.4 + 6.0.0-rtm.21501.4 diff --git a/eng/docker/debian/Dockerfile b/eng/docker/debian/Dockerfile index 891658239..ebafe9adb 100644 --- a/eng/docker/debian/Dockerfile +++ b/eng/docker/debian/Dockerfile @@ -4,7 +4,7 @@ # # Dockerfile that creates a container suitable to build dotnet-cli -FROM mcr.microsoft.com/dotnet-buildtools/prereqs:debian-stretch-d61254f-20190807161114 +FROM mcr.microsoft.com/dotnet-buildtools/prereqs:debian-stretch-20211001171226-047508b # Install the deb packaging toolchain we need to build debs RUN apt-get update \ From ec5186a482ce6ec80221a0d8b233fdac675cf21e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 4 Oct 2021 14:13:52 +0000 Subject: [PATCH 094/140] Update dependencies from https://github.com/dotnet/sdk build 20211004.2 (#12229) [release/6.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.DotNet.Common.ItemTemplates: from 6.0.100-rtm.21501.8 to 6.0.100-rtm.21504.1 (parent: Microsoft.NET.Sdk) - Microsoft.TemplateEngine.Cli: from 6.0.100-rtm.21501.8 to 6.0.100-rtm.21504.1 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3e3377266..bf7f7aca6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -89,23 +89,23 @@ c40ef7e056b48e011c43a21354d6790ba6b8b4fc - + https://github.com/dotnet/templating - e3ad8b07978395c14ed697535186fcc3222dc7a0 + a99b3b48523b75f662e69810c00f9905c67dae7b - + https://github.com/dotnet/templating - e3ad8b07978395c14ed697535186fcc3222dc7a0 + a99b3b48523b75f662e69810c00f9905c67dae7b - + https://github.com/dotnet/sdk - 1cdf7c79a3d0e65093cb5821ba0406f8b2aecd54 + 6bb79b8142a979c13ef10d01fd3528b35f4ccdb0 - + https://github.com/dotnet/sdk - 1cdf7c79a3d0e65093cb5821ba0406f8b2aecd54 + 6bb79b8142a979c13ef10d01fd3528b35f4ccdb0 diff --git a/eng/Versions.props b/eng/Versions.props index 337cba236..22c80c2b2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,7 +31,7 @@ - 6.0.100-rtm.21501.8 + 6.0.100-rtm.21504.1 @@ -56,8 +56,8 @@ - 6.0.100-rtm.21503.6 - 6.0.100-rtm.21503.6 + 6.0.100-rtm.21504.2 + 6.0.100-rtm.21504.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 6b92690374420b2e2b129bfd5f13f5d8f3cdea5f Mon Sep 17 00:00:00 2001 From: sfoslund Date: Mon, 4 Oct 2021 11:00:15 -0700 Subject: [PATCH 095/140] Revert runtime commit sha change --- eng/Version.Details.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6af7c9e45..18b9816e3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -19,7 +19,7 @@ https://github.com/dotnet/runtime - e013f14c5330375a18656dea8dca14e5602a3ae0 + 6c5c32d56ec74280783664c2526937d23cfc3467 From b36ba0e039ef4feb3fef4529fa6e00b8bbd34d85 Mon Sep 17 00:00:00 2001 From: MichaelSimons Date: Mon, 4 Oct 2021 19:54:45 +0000 Subject: [PATCH 096/140] Resolve source-build patch conflicts --- ...flection.Metadata-with-PrivateAssets.patch | 26 ------------------- ...tReleasesVersion-Versions.props-entr.patch | 2 +- 2 files changed, 1 insertion(+), 27 deletions(-) delete mode 100644 src/SourceBuild/tarball/patches/runtime/0003-Mark-System.Reflection.Metadata-with-PrivateAssets.patch diff --git a/src/SourceBuild/tarball/patches/runtime/0003-Mark-System.Reflection.Metadata-with-PrivateAssets.patch b/src/SourceBuild/tarball/patches/runtime/0003-Mark-System.Reflection.Metadata-with-PrivateAssets.patch deleted file mode 100644 index d30312eab..000000000 --- a/src/SourceBuild/tarball/patches/runtime/0003-Mark-System.Reflection.Metadata-with-PrivateAssets.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 046e225f600b1bdb37d6e05985db77ff894802fe Mon Sep 17 00:00:00 2001 -From: MichaelSimons -Date: Tue, 14 Sep 2021 17:01:16 +0000 -Subject: [PATCH] Pin System.Reflection.Metadata version for crossgen - -Resolution to the root cause of https://github.com/dotnet/runtime/issues/58800 ---- - .../ILCompiler.TypeSystem.ReadyToRun.csproj | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/coreclr/tools/aot/ILCompiler.TypeSystem.ReadyToRun/ILCompiler.TypeSystem.ReadyToRun.csproj b/src/coreclr/tools/aot/ILCompiler.TypeSystem.ReadyToRun/ILCompiler.TypeSystem.ReadyToRun.csproj -index 82452cfa3e9..23cbbd5ad9f 100644 ---- a/src/coreclr/tools/aot/ILCompiler.TypeSystem.ReadyToRun/ILCompiler.TypeSystem.ReadyToRun.csproj -+++ b/src/coreclr/tools/aot/ILCompiler.TypeSystem.ReadyToRun/ILCompiler.TypeSystem.ReadyToRun.csproj -@@ -30,7 +30,7 @@ - 4.3.0 - - -- $(SystemReflectionMetadataVersion) -+ 5.0.0 - - - 1.3.0 --- -2.29.2 - diff --git a/src/SourceBuild/tarball/patches/sdk/0001-Rename-DeploymentReleasesVersion-Versions.props-entr.patch b/src/SourceBuild/tarball/patches/sdk/0001-Rename-DeploymentReleasesVersion-Versions.props-entr.patch index 007eba94b..167c5ce21 100644 --- a/src/SourceBuild/tarball/patches/sdk/0001-Rename-DeploymentReleasesVersion-Versions.props-entr.patch +++ b/src/SourceBuild/tarball/patches/sdk/0001-Rename-DeploymentReleasesVersion-Versions.props-entr.patch @@ -19,7 +19,7 @@ index 0a7442c7c4..741b654ec4 100644 @@ -36,7 +36,7 @@ 4.0.5 5.0.2 - 6.0.0-rtm.21479.7 + 6.0.0-rtm.21501.9 - 1.0.0-preview1.1.21112.1 + 1.0.0-preview1.1.21112.1 4.6.0 From 457785c87e8b21f228ba11ceab066374b4bd5edf Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 4 Oct 2021 19:55:54 +0000 Subject: [PATCH 097/140] Update dependencies from https://github.com/dotnet/sdk build 20211004.6 (#12237) [release/6.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.NETCore.App.Ref: from 6.0.0-rtm.21501.9 to 6.0.0-rtm.21504.6 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.NetCore.TargetingPack.x64.6.0: from 6.0.0-rtm.21501.9 to 6.0.0-rtm.21504.6 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Runtime.win-x64: from 6.0.0-rtm.21501.9 to 6.0.0-rtm.21504.6 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Host.win-x64: from 6.0.0-rtm.21501.9 to 6.0.0-rtm.21504.6 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.DotNetHostResolver: from 6.0.0-rtm.21501.9 to 6.0.0-rtm.21504.6 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.Platforms: from 6.0.0-rtm.21501.9 to 6.0.0-rtm.21504.6 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.0-rtm.21501.9 to 6.0.0-rtm.21504.6 (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 bf7f7aca6..9cc66ecc4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,29 +17,29 @@ https://github.com/dotnet/windowsdesktop 4a370044ea3502b4b1e88878084da989b3d33fb4 - + https://github.com/dotnet/runtime - 6c5c32d56ec74280783664c2526937d23cfc3467 + ebaef9c408aedefd675dfcaea253ef5d7e7f8665 - + https://github.com/dotnet/runtime - 6c5c32d56ec74280783664c2526937d23cfc3467 + ebaef9c408aedefd675dfcaea253ef5d7e7f8665 - + https://github.com/dotnet/runtime - 6c5c32d56ec74280783664c2526937d23cfc3467 + ebaef9c408aedefd675dfcaea253ef5d7e7f8665 - + https://github.com/dotnet/runtime - 6c5c32d56ec74280783664c2526937d23cfc3467 + ebaef9c408aedefd675dfcaea253ef5d7e7f8665 - + https://github.com/dotnet/runtime - 6c5c32d56ec74280783664c2526937d23cfc3467 + ebaef9c408aedefd675dfcaea253ef5d7e7f8665 - + https://github.com/dotnet/runtime - 6c5c32d56ec74280783664c2526937d23cfc3467 + ebaef9c408aedefd675dfcaea253ef5d7e7f8665 @@ -47,9 +47,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 6c5c32d56ec74280783664c2526937d23cfc3467 + ebaef9c408aedefd675dfcaea253ef5d7e7f8665 https://github.com/dotnet/aspnetcore @@ -98,14 +98,14 @@ a99b3b48523b75f662e69810c00f9905c67dae7b - + https://github.com/dotnet/sdk - 6bb79b8142a979c13ef10d01fd3528b35f4ccdb0 + f1be203172a81bc22ed55a0a0bb57cbed3ad236b - + https://github.com/dotnet/sdk - 6bb79b8142a979c13ef10d01fd3528b35f4ccdb0 + f1be203172a81bc22ed55a0a0bb57cbed3ad236b diff --git a/eng/Versions.props b/eng/Versions.props index 22c80c2b2..e6a98dab6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,24 +56,24 @@ - 6.0.100-rtm.21504.2 - 6.0.100-rtm.21504.2 + 6.0.100-rtm.21504.6 + 6.0.100-rtm.21504.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 6.0.0-rtm.21501.9 + 6.0.0-rtm.21504.6 - 6.0.0-rtm.21501.9 - 6.0.0-rtm.21501.9 - 6.0.0-rtm.21501.9 - 6.0.0-rtm.21501.9 - 6.0.0-rtm.21501.9 - 6.0.0-rtm.21501.9 + 6.0.0-rtm.21504.6 + 6.0.0-rtm.21504.6 + 6.0.0-rtm.21504.6 + 6.0.0-rtm.21504.6 + 6.0.0-rtm.21504.6 + 6.0.0-rtm.21504.6 2.1.0 From 3ebd16481b77d0357acf82130e6186f59eab7c58 Mon Sep 17 00:00:00 2001 From: MichaelSimons Date: Mon, 4 Oct 2021 20:41:51 +0000 Subject: [PATCH 098/140] Resolve source-build patch conflicts --- ...1-Rename-DeploymentReleasesVersion-Versions.props-entr.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/SourceBuild/tarball/patches/sdk/0001-Rename-DeploymentReleasesVersion-Versions.props-entr.patch b/src/SourceBuild/tarball/patches/sdk/0001-Rename-DeploymentReleasesVersion-Versions.props-entr.patch index 167c5ce21..1a64f486f 100644 --- a/src/SourceBuild/tarball/patches/sdk/0001-Rename-DeploymentReleasesVersion-Versions.props-entr.patch +++ b/src/SourceBuild/tarball/patches/sdk/0001-Rename-DeploymentReleasesVersion-Versions.props-entr.patch @@ -19,7 +19,7 @@ index 0a7442c7c4..741b654ec4 100644 @@ -36,7 +36,7 @@ 4.0.5 5.0.2 - 6.0.0-rtm.21501.9 + 6.0.0-rtm.21504.6 - 1.0.0-preview1.1.21112.1 + 1.0.0-preview1.1.21112.1 4.6.0 From d19c0ef387bfb36b31229d36d443143ebbaa6154 Mon Sep 17 00:00:00 2001 From: Chris Rummel Date: Mon, 4 Oct 2021 15:55:41 -0500 Subject: [PATCH 099/140] [SourceBuild] Add omnisharp fix patch (#12227) * Add omnisharp fix path * Address review comments. --- ...-Fix-Omnisharp-add-needed-extra-TFMs.patch | 61 +++++++++++++++++++ 1 file changed, 61 insertions(+) create mode 100644 src/SourceBuild/tarball/content/patches/runtime/0001-Fix-Omnisharp-add-needed-extra-TFMs.patch diff --git a/src/SourceBuild/tarball/content/patches/runtime/0001-Fix-Omnisharp-add-needed-extra-TFMs.patch b/src/SourceBuild/tarball/content/patches/runtime/0001-Fix-Omnisharp-add-needed-extra-TFMs.patch new file mode 100644 index 000000000..192ed3519 --- /dev/null +++ b/src/SourceBuild/tarball/content/patches/runtime/0001-Fix-Omnisharp-add-needed-extra-TFMs.patch @@ -0,0 +1,61 @@ +From 93de82c03ff71f897599db2824b959d020b877bd Mon Sep 17 00:00:00 2001 +From: Chris Rummel +Date: Thu, 30 Sep 2021 16:08:28 -0500 +Subject: [PATCH 1/2] Fix Omnisharp: Add needed extra TFMs. + +Omnisharp requires the net46 TFMs of this files explictly and we don't build them by default. This patch adds net46 to the relevant projects. The original issue for this was https://github.com/OmniSharp/omnisharp-vscode/issues/4610 and the long-term fix of switching to net>4 TFM is tracked in https://github.com/OmniSharp/omnisharp-vscode/issues/4360. + +--- + src/libraries/Directory.Build.props | 2 +- + .../ref/System.Resources.Extensions.csproj | 4 ++-- + .../src/System.Resources.Extensions.csproj | 2 +- + 3 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/src/libraries/Directory.Build.props b/src/libraries/Directory.Build.props +index 4d39fad397e..649c669517e 100644 +--- a/src/libraries/Directory.Build.props ++++ b/src/libraries/Directory.Build.props +@@ -27,7 +27,7 @@ + + + +- net461;net462;net47;net471;net472 ++ net46;net461;net462;net47;net471;net472 + + + +diff --git a/src/libraries/System.Resources.Extensions/ref/System.Resources.Extensions.csproj b/src/libraries/System.Resources.Extensions/ref/System.Resources.Extensions.csproj +index 99037ae459c..848be41690c 100644 +--- a/src/libraries/System.Resources.Extensions/ref/System.Resources.Extensions.csproj ++++ b/src/libraries/System.Resources.Extensions/ref/System.Resources.Extensions.csproj +@@ -1,6 +1,6 @@ + + +- $(NetCoreAppCurrent);netstandard2.0;net461 ++ $(NetCoreAppCurrent);netstandard2.0;net46;net461 + enable + + +@@ -11,4 +11,4 @@ + + + +- +\ No newline at end of file ++ +diff --git a/src/libraries/System.Resources.Extensions/src/System.Resources.Extensions.csproj b/src/libraries/System.Resources.Extensions/src/System.Resources.Extensions.csproj +index adacc9b977e..38d4c145352 100644 +--- a/src/libraries/System.Resources.Extensions/src/System.Resources.Extensions.csproj ++++ b/src/libraries/System.Resources.Extensions/src/System.Resources.Extensions.csproj +@@ -1,7 +1,7 @@ + + + true +- $(NetCoreAppCurrent);netstandard2.0;net461 ++ $(NetCoreAppCurrent);netstandard2.0;net46;net461 + $(DefineConstants);RESOURCES_EXTENSIONS + enable + +-- +2.17.1 + From 056d280d35e60da4639f84d1548706d0c7f6a2ae Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Mon, 4 Oct 2021 16:43:30 -0500 Subject: [PATCH 100/140] Disable workload bundled manifests for source-build (#12231) --- src/redist/targets/BundledManifests.targets | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/redist/targets/BundledManifests.targets b/src/redist/targets/BundledManifests.targets index e8e52d246..5c4623173 100644 --- a/src/redist/targets/BundledManifests.targets +++ b/src/redist/targets/BundledManifests.targets @@ -11,7 +11,7 @@ - + [%(Version)] @@ -26,7 +26,8 @@ + DependsOnTargets="LayoutManifestsForSDK;LayoutManifestsForMSI" + Condition="'$(DotNetBuildFromSource)' != 'true'"/> From a1510581577e0a9efcd8ad1ada2dac7b1c837a6f Mon Sep 17 00:00:00 2001 From: Jacques Eloff Date: Tue, 5 Oct 2021 00:15:42 -0700 Subject: [PATCH 101/140] Remove duplicate telemetry (#12243) --- src/redist/targets/packaging/windows/clisdk/dotnet.wxs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/redist/targets/packaging/windows/clisdk/dotnet.wxs b/src/redist/targets/packaging/windows/clisdk/dotnet.wxs index 902a2505f..7d7c21393 100644 --- a/src/redist/targets/packaging/windows/clisdk/dotnet.wxs +++ b/src/redist/targets/packaging/windows/clisdk/dotnet.wxs @@ -44,8 +44,8 @@ Impersonate="no"/> - - + NOT Installed + NOT Installed From fce1e1b7876345acaddc8bd03e9ae06bc717967e Mon Sep 17 00:00:00 2001 From: MichaelSimons Date: Tue, 5 Oct 2021 15:59:33 +0000 Subject: [PATCH 102/140] Re-enable tarball PR validation --- .vsts-ci.yml | 9 ++++----- eng/Version.Details.xml | 4 ++-- .../templates/job/source-build-run-tarball-build.yml | 7 +++---- 3 files changed, 9 insertions(+), 11 deletions(-) diff --git a/.vsts-ci.yml b/.vsts-ci.yml index 68b45b02a..5d0247741 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -353,11 +353,10 @@ stages: - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball.yml - # Disable until tarball build cleanly - # - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml - # parameters: - # dependsOn: Source_Build_Create_Tarball - # condition: eq(dependencies.Source_Build_Create_Tarball.outputs['Tarball_Build_Check._includeTarballBuild'], 'true') + - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml + parameters: + dependsOn: Source_Build_Create_Tarball + condition: eq(dependencies.Source_Build_Create_Tarball.outputs['Tarball_Build_Check._includeTarballBuild'], 'true') # https://github.com/dotnet/core-sdk/issues/248 # - template: /eng/build.yml diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index bca46e7a2..ef8b3c77b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -207,9 +207,9 @@ https://github.com/dotnet/arcade c575da80f465e0b5fb98f416be92bb98b2f54b41 - + https://github.com/dotnet/source-build-reference-packages - f5558f1481f841e318e301d9cb7dd6f0fe4dd64e + 8468769b427d87f46501993de206bfb39265d432 diff --git a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml index 2d9d06e6d..a6d2f8690 100644 --- a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml +++ b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml @@ -27,10 +27,9 @@ jobs: Fedora33-Online: _runOnline: true _Container: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-33-20210222183538-031e7d2 - # Disable until prebuilts are eliminated - # Fedora33-Offline: - # _runOnline: false - # _Container: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-33-20210222183538-031e7d2 + Fedora33-Offline: + _runOnline: false + _Container: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-33-20210222183538-031e7d2 timeoutInMinutes: 210 variables: _TarballDir: $(Build.StagingDirectory)/tarball From 67fd8666c0d4f5ae2f8be94cffabb2746bfc9129 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 5 Oct 2021 22:38:04 +0000 Subject: [PATCH 103/140] Dependency coherency updates (#12253) [release/6.0.1xx] Update dependencies to ensure coherency - Coherency Updates: - VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.0-rtm.21504.6 to 6.0.0-rtm.21504.6 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index bca46e7a2..b517171b1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -19,7 +19,7 @@ https://github.com/dotnet/runtime - 6c5c32d56ec74280783664c2526937d23cfc3467 + ebaef9c408aedefd675dfcaea253ef5d7e7f8665 From 46fa4c306e37f233c3244bf84897856980e64f98 Mon Sep 17 00:00:00 2001 From: Jacques Eloff Date: Tue, 5 Oct 2021 15:50:59 -0700 Subject: [PATCH 104/140] Update WiX to 3.14.0.5722 (#12252) --- eng/Versions.props | 2 +- src/redist/targets/GenerateMSIs.targets | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index da5f0d109..66a4c5de0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -105,7 +105,7 @@ $(MicrosoftNETCoreAppRuntimePackageVersion) - 1.0.0-v3.14.0.4118 + 1.0.0-v3.14.0.5722 diff --git a/src/redist/targets/GenerateMSIs.targets b/src/redist/targets/GenerateMSIs.targets index 7ea8792fb..e0e948128 100644 --- a/src/redist/targets/GenerateMSIs.targets +++ b/src/redist/targets/GenerateMSIs.targets @@ -13,7 +13,7 @@ - 1.0.0-v3.14.0.4118 + $(WixPackageVersion) https://netcorenativeassets.blob.core.windows.net/resource-packages/external/windows/wix/Microsoft.Signed.Wix-$(WixVersion).zip $(ArtifactsDir)Tools/WixTools/$(WixVersion) $(WixRoot)/WixTools.$(WixVersion).zip From 620b231b83a425bc5e9b08230af846dd730cfa9a Mon Sep 17 00:00:00 2001 From: Chris Rummel Date: Tue, 5 Oct 2021 20:58:17 -0500 Subject: [PATCH 105/140] Add smoke-test-prereqs to NuGet.config. --- src/SourceBuild/tarball/content/smoke-testNuGet.Config | 1 + 1 file changed, 1 insertion(+) diff --git a/src/SourceBuild/tarball/content/smoke-testNuGet.Config b/src/SourceBuild/tarball/content/smoke-testNuGet.Config index 7dee71e3e..79dbf806a 100644 --- a/src/SourceBuild/tarball/content/smoke-testNuGet.Config +++ b/src/SourceBuild/tarball/content/smoke-testNuGet.Config @@ -14,6 +14,7 @@ + From 343ff37cc5458bd84528ea0e4563fbb248106a5d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Patalas?= Date: Wed, 6 Oct 2021 15:09:23 +0200 Subject: [PATCH 106/140] [release/6.0.1xx] Migrate to 1ES hosted pools (#12054) From c53f76dc2677f0f8add1a2a9c479287ff2012c53 Mon Sep 17 00:00:00 2001 From: MichaelSimons Date: Wed, 6 Oct 2021 16:00:13 +0000 Subject: [PATCH 107/140] Add runtime patch to enable host.pkg subset to eliminate prebuilts --- ...able-host.pkg-subset-in-source-build.patch | 28 +++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 src/SourceBuild/tarball/patches/runtime/0003-Enable-host.pkg-subset-in-source-build.patch diff --git a/src/SourceBuild/tarball/patches/runtime/0003-Enable-host.pkg-subset-in-source-build.patch b/src/SourceBuild/tarball/patches/runtime/0003-Enable-host.pkg-subset-in-source-build.patch new file mode 100644 index 000000000..ce3649176 --- /dev/null +++ b/src/SourceBuild/tarball/patches/runtime/0003-Enable-host.pkg-subset-in-source-build.patch @@ -0,0 +1,28 @@ +From 0e68346f6127a82cf54e910ddea9889a56ca9e21 Mon Sep 17 00:00:00 2001 +From: MichaelSimons +Date: Wed, 6 Oct 2021 15:32:45 +0000 +Subject: [PATCH] Enable host.pkg subset in source-build + +Backported to runtime with https://github.com/dotnet/runtime/pull/60069 +--- + eng/Subsets.props | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/eng/Subsets.props b/eng/Subsets.props +index c935f7c3a81..a7c5fb0e96e 100644 +--- a/eng/Subsets.props ++++ b/eng/Subsets.props +@@ -66,8 +66,8 @@ + $(DefaultLibrariesSubsets)libs.ref+libs.src + $(DefaultLibrariesSubsets)+libs.pretest + +- host.native+host.tools +- $(DefaultHostSubsets)+host.pkg+host.tests ++ host.native+host.tools+host.pkg ++ $(DefaultHostSubsets)+host.tests + + host.native + +-- +2.29.2 + From 5bcda60edd999a691572e3090ade26a40307077f Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Wed, 6 Oct 2021 09:15:22 -0700 Subject: [PATCH 108/140] Add source build tarball setup nuget feeds and remove unused group (#12080) From b173b6979eff803bd6b7ee919596909acc2fee08 Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Wed, 6 Oct 2021 10:05:17 -0700 Subject: [PATCH 109/140] Update dotnet/diagnostics version (#12257) Update the dotnet diagnostics version to a slightly newer version that incorporates a re-categorization of some dependencies there. This removes a cycle in the product --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b517171b1..5bb7c6c26 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -181,9 +181,9 @@ 7431bf2f3c204cbbc326c8d55ce4ac5cad7661d6 - + https://github.com/dotnet/diagnostics - f758ec93e1098e5bcbc4550f8a36c6cd1ce04918 + ab3eb7a525e31dc6fb4d9cc0b7154fa2be58dac1 From 30b84b58d168c5a122c223a11dc6951218c7b126 Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Wed, 6 Oct 2021 10:51:36 -0700 Subject: [PATCH 110/140] [release/6.0.1xx] Additional servicing fixes (#12084) * Add an explicit dependency on the 6.0 project templates These ship incrementally, so it's important to keep the dependencies separate from other templating dependencies * Use the shared framework VS redist package version to find the windows desktop blobs Using the targeting pack version is incorrect --- eng/Version.Details.xml | 4 ++++ eng/Versions.props | 2 +- src/redist/targets/Crossgen.targets | 2 +- src/redist/targets/GenerateLayout.targets | 2 +- 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5bb7c6c26..1b3b6186f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -99,6 +99,10 @@ a99b3b48523b75f662e69810c00f9905c67dae7b + + https://github.com/dotnet/templating + a99b3b48523b75f662e69810c00f9905c67dae7b + https://github.com/dotnet/sdk f1be203172a81bc22ed55a0a0bb57cbed3ad236b diff --git a/eng/Versions.props b/eng/Versions.props index 66a4c5de0..5e61fbf53 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -113,7 +113,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - $(MicrosoftDotNetCommonItemTemplatesPackageVersion) + 6.0.100-rtm.21504.1 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftDotnetWinFormsProjectTemplatesPackageVersion) diff --git a/src/redist/targets/Crossgen.targets b/src/redist/targets/Crossgen.targets index 91f6e2326..8949af132 100644 --- a/src/redist/targets/Crossgen.targets +++ b/src/redist/targets/Crossgen.targets @@ -11,7 +11,7 @@ $(RedistLayoutPath)shared/$(SharedFrameworkName)/$(MicrosoftNETCoreAppRuntimePackageVersion) - $(RedistLayoutPath)shared/$(SharedFrameworkName)/$(VSRedistCommonNetCoreTargetingPackx6460PackageVersion) + $(RedistLayoutPath)shared/$(SharedFrameworkName)/$(VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion) diff --git a/src/redist/targets/GenerateLayout.targets b/src/redist/targets/GenerateLayout.targets index 66da486ca..f2cc4113b 100644 --- a/src/redist/targets/GenerateLayout.targets +++ b/src/redist/targets/GenerateLayout.targets @@ -316,7 +316,7 @@ - $(WinFormsAndWpfSharedFxRootUrl)$(WindowsDesktopTargetingPackBlobVersion) + $(WinFormsAndWpfSharedFxRootUrl)$(WindowsDesktopBlobVersion) $(WinFormsAndWpfSharedFxArchiveFileName) From e043659ed753efb4d209c1365efd3de7469dc5bc Mon Sep 17 00:00:00 2001 From: Daniel Plaisted Date: Tue, 5 Oct 2021 13:53:52 -0700 Subject: [PATCH 111/140] Add support for targeting Windows version 22000 --- eng/ManualVersions.props | 1 + src/redist/targets/GenerateBundledVersions.targets | 1 + 2 files changed, 2 insertions(+) diff --git a/eng/ManualVersions.props b/eng/ManualVersions.props index d32a7f3e1..57ae4fd2d 100644 --- a/eng/ManualVersions.props +++ b/eng/ManualVersions.props @@ -13,5 +13,6 @@ 10.0.18362.21 10.0.19041.21 10.0.20348.21 + 10.0.22000.21 diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets index f9593bbea..db5626c5f 100644 --- a/src/redist/targets/GenerateBundledVersions.targets +++ b/src/redist/targets/GenerateBundledVersions.targets @@ -672,6 +672,7 @@ Copyright (c) .NET Foundation. All rights reserved. /> + From 3feb30d56546904e13e5d0cf04793140d3f6fc13 Mon Sep 17 00:00:00 2001 From: Daniel Plaisted Date: Wed, 6 Oct 2021 10:57:55 -0700 Subject: [PATCH 112/140] Add test for targeting Windows 22000 --- test/EndToEnd/GivenWindowsApp.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test/EndToEnd/GivenWindowsApp.cs b/test/EndToEnd/GivenWindowsApp.cs index aa0824ff1..bf2305953 100644 --- a/test/EndToEnd/GivenWindowsApp.cs +++ b/test/EndToEnd/GivenWindowsApp.cs @@ -16,7 +16,8 @@ namespace EndToEnd [InlineData("10.0.17763.0")] [InlineData("10.0.18362.0")] [InlineData("10.0.19041.0")] - [InlineData("10.0.20348.0", Skip = "Package not published yet")] + [InlineData("10.0.20348.0")] + [InlineData("10.0.22000.0", Skip = "Package not published yet")] public void ItCanBuildAndRun(string targetPlatformVersion) { var testInstance = TestAssets.Get(TestAssetKinds.TestProjects, "UseCswinrt") From 02135a7f42d494d65f304ce78ff8e8b49793bd50 Mon Sep 17 00:00:00 2001 From: Eric StJohn Date: Wed, 6 Oct 2021 18:38:46 -0700 Subject: [PATCH 113/140] [release/6.0.1xx] Use WIX_NATIVE_MACHINE to detect native architecture of target machine (#12259) * Use WIX_NATIVE_MACHINE to detect native architecture of target machine * Ensure we reference WIX_NATIVE_MACHINE property --- .../packaging/windows/clisdk/bundle.wxs | 19 ++++----------- .../windows/clisdk/dotnethome_x64.wxs | 23 +++++++++++-------- .../packaging/windows/clisdk/variables.wxi | 7 ++++++ 3 files changed, 26 insertions(+), 23 deletions(-) diff --git a/src/redist/targets/packaging/windows/clisdk/bundle.wxs b/src/redist/targets/packaging/windows/clisdk/bundle.wxs index 40b118b73..926929aa6 100644 --- a/src/redist/targets/packaging/windows/clisdk/bundle.wxs +++ b/src/redist/targets/packaging/windows/clisdk/bundle.wxs @@ -20,7 +20,7 @@ - WixBundleInstalled OR (NOT DOTNETHOME_ARM64 ~= DOTNETHOME_X64) OR (NOT NativeProcessorArchitecture="ARM64") OR DOTNETHOMESIMILARITYCHECKOVERRIDE + WixBundleInstalled OR (NOT DOTNETHOME_ARM64 ~= DOTNETHOME_X64) OR (NOT NativeMachine="$(var.NativeMachine_arm64)") OR DOTNETHOMESIMILARITYCHECKOVERRIDE @@ -76,21 +76,12 @@ Root="HKLM" Key="SOFTWARE\dotnet\Setup\InstalledVersions\x64" Value="InstallLocation" /> - - - - + - + - + - + - ? + - + + - NOT %PROCESSOR_ARCHITECTURE="$(var.InstallerArchitecture)" + + VersionNT64 OR + + WIX_NATIVE_MACHINE AND NOT WIX_NATIVE_MACHINE="$(var.InstallerNativeMachine)" diff --git a/src/redist/targets/packaging/windows/clisdk/variables.wxi b/src/redist/targets/packaging/windows/clisdk/variables.wxi index bad1ff7ef..aa574750b 100644 --- a/src/redist/targets/packaging/windows/clisdk/variables.wxi +++ b/src/redist/targets/packaging/windows/clisdk/variables.wxi @@ -15,7 +15,14 @@ + + + + + + From 17811054adcf4c76c4a605bedfaca86c508b4ee8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 7 Oct 2021 15:51:06 +0000 Subject: [PATCH 114/140] [release/6.0.1xx] Update dependencies from dotnet/sdk (#12260) [release/6.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.WindowsDesktop.App.Ref: from 6.0.0-rtm.21501.4 to 6.0.0-rtm.21505.6 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0: from 6.0.0-rtm.21501.4 to 6.0.0-rtm.21505.6 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0: from 6.0.0-rtm.21501.4 to 6.0.0-rtm.21505.6 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Ref: from 6.0.0-rtm.21504.6 to 6.0.0-rtm.21506.22 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.NetCore.TargetingPack.x64.6.0: from 6.0.0-rtm.21504.6 to 6.0.0-rtm.21506.22 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Runtime.win-x64: from 6.0.0-rtm.21504.6 to 6.0.0-rtm.21506.22 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Host.win-x64: from 6.0.0-rtm.21504.6 to 6.0.0-rtm.21506.22 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.DotNetHostResolver: from 6.0.0-rtm.21504.6 to 6.0.0-rtm.21506.22 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.Platforms: from 6.0.0-rtm.21504.6 to 6.0.0-rtm.21506.22 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref: from 6.0.0-rtm.21501.15 to 6.0.0-rtm.21507.1 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 6.0.0-rtm.21501.15 to 6.0.0-rtm.21507.1 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.0-rtm.21501.15 to 6.0.0-rtm.21507.1 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0: from 6.0.0-rtm.21501.15 to 6.0.0-rtm.21507.1 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 6.0.0-rtm.21501.15 to 6.0.0-rtm.21507.1 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 6.0.0-rtm.21501.15 to 6.0.0-rtm.21507.1 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Common.ItemTemplates: from 6.0.100-rtm.21504.1 to 6.0.100-rtm.21504.8 (parent: Microsoft.NET.Sdk) - Microsoft.TemplateEngine.Cli: from 6.0.100-rtm.21504.1 to 6.0.100-rtm.21504.8 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Common.ProjectTemplates.6.0: from 6.0.100-rtm.21504.1 to 6.0.100-rtm.21504.8 (parent: Microsoft.NET.Sdk) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.0-rtm.21501.4 to 6.0.0-rtm.21505.6 (parent: Microsoft.NET.Sdk) - Microsoft.Dotnet.WinForms.ProjectTemplates: from 6.0.0-rtm.21501.5 to 6.0.0-rtm.21505.4 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.0-rtm.21501.4 to 6.0.0-rtm.21505.6 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Wpf.ProjectTemplates: from 6.0.0-rtm.21501.4 to 6.0.0-rtm.21505.8 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.Net.Compilers.Toolset: from 4.0.0-5.21501.19 to 4.0.0-5.21505.4 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.0-rtm.21504.6 to 6.0.0-rtm.21506.22 (parent: Microsoft.NET.Sdk) - Resolve source-build patch conflicts --- eng/Version.Details.xml | 100 +++++++++--------- eng/Versions.props | 46 ++++---- ...nable-doc-generation-in-source-build.patch | 25 ----- ...tReleasesVersion-Versions.props-entr.patch | 4 +- 4 files changed, 75 insertions(+), 100 deletions(-) delete mode 100644 src/SourceBuild/tarball/patches/runtime/0001-Enable-doc-generation-in-source-build.patch diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1b3b6186f..95081d051 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://github.com/dotnet/windowsdesktop - 4a370044ea3502b4b1e88878084da989b3d33fb4 + c8ae10e08f87b28ed3d936f67b87a4c7cb59142d - + https://github.com/dotnet/windowsdesktop - 4a370044ea3502b4b1e88878084da989b3d33fb4 + c8ae10e08f87b28ed3d936f67b87a4c7cb59142d - + https://github.com/dotnet/windowsdesktop - 4a370044ea3502b4b1e88878084da989b3d33fb4 + c8ae10e08f87b28ed3d936f67b87a4c7cb59142d - + https://github.com/dotnet/windowsdesktop - 4a370044ea3502b4b1e88878084da989b3d33fb4 + c8ae10e08f87b28ed3d936f67b87a4c7cb59142d - + https://github.com/dotnet/runtime - ebaef9c408aedefd675dfcaea253ef5d7e7f8665 + 7d6c1ef01013b7bedd4d51e4ec8241e862c271ae - + https://github.com/dotnet/runtime - ebaef9c408aedefd675dfcaea253ef5d7e7f8665 + 7d6c1ef01013b7bedd4d51e4ec8241e862c271ae - + https://github.com/dotnet/runtime - ebaef9c408aedefd675dfcaea253ef5d7e7f8665 + 7d6c1ef01013b7bedd4d51e4ec8241e862c271ae - + https://github.com/dotnet/runtime - ebaef9c408aedefd675dfcaea253ef5d7e7f8665 + 7d6c1ef01013b7bedd4d51e4ec8241e862c271ae - + https://github.com/dotnet/runtime - ebaef9c408aedefd675dfcaea253ef5d7e7f8665 + 7d6c1ef01013b7bedd4d51e4ec8241e862c271ae - + https://github.com/dotnet/runtime - ebaef9c408aedefd675dfcaea253ef5d7e7f8665 + 7d6c1ef01013b7bedd4d51e4ec8241e862c271ae @@ -48,34 +48,34 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - ebaef9c408aedefd675dfcaea253ef5d7e7f8665 + 7d6c1ef01013b7bedd4d51e4ec8241e862c271ae - + https://github.com/dotnet/aspnetcore - ff24fca527d18e0bae90922e147c6a08c54da235 + c2e28176ab4a615d714be839464ab18119c423e5 - + https://github.com/dotnet/aspnetcore - ff24fca527d18e0bae90922e147c6a08c54da235 + c2e28176ab4a615d714be839464ab18119c423e5 - + https://github.com/dotnet/aspnetcore - ff24fca527d18e0bae90922e147c6a08c54da235 + c2e28176ab4a615d714be839464ab18119c423e5 - + https://github.com/dotnet/aspnetcore - ff24fca527d18e0bae90922e147c6a08c54da235 + c2e28176ab4a615d714be839464ab18119c423e5 - + https://github.com/dotnet/aspnetcore - ff24fca527d18e0bae90922e147c6a08c54da235 + c2e28176ab4a615d714be839464ab18119c423e5 - + https://github.com/dotnet/aspnetcore - ff24fca527d18e0bae90922e147c6a08c54da235 + c2e28176ab4a615d714be839464ab18119c423e5 https://github.com/dotnet/test-templates @@ -90,36 +90,36 @@ c40ef7e056b48e011c43a21354d6790ba6b8b4fc - + https://github.com/dotnet/templating - a99b3b48523b75f662e69810c00f9905c67dae7b + 72fe1caeed1d1fa68b721a42f16782e4ea0ca136 - + https://github.com/dotnet/templating - a99b3b48523b75f662e69810c00f9905c67dae7b + 72fe1caeed1d1fa68b721a42f16782e4ea0ca136 - + https://github.com/dotnet/templating - a99b3b48523b75f662e69810c00f9905c67dae7b + 72fe1caeed1d1fa68b721a42f16782e4ea0ca136 - + https://github.com/dotnet/sdk - f1be203172a81bc22ed55a0a0bb57cbed3ad236b + 65ef52eeb53231d33c8f0eee2006641daffc0809 - + https://github.com/dotnet/sdk - f1be203172a81bc22ed55a0a0bb57cbed3ad236b + 65ef52eeb53231d33c8f0eee2006641daffc0809 - + https://github.com/dotnet/winforms - bc7b7501bd2815808d58db2657519c896aab1524 + a6350cb6faf614a4b2110b809bcda1859836ee46 - + https://github.com/dotnet/wpf - 1fa418e6138b3047577d506af5335cabeb58e6ec + cd0308253a2f9df2e21db640e975fc2320b85e23 https://github.com/dotnet/fsharp @@ -141,9 +141,9 @@ linker - + https://github.com/dotnet/roslyn - 8e1779e16298415843e85029d8b52a1ae9bb4c30 + ae62c5fdc561eb991cb14d31b3d865fdf6465d94 diff --git a/eng/Versions.props b/eng/Versions.props index 5e61fbf53..844a541b2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,15 +23,15 @@ - 6.0.0-rtm.21501.5 + 6.0.0-rtm.21505.4 - 6.0.0-rtm.21501.4 + 6.0.0-rtm.21505.8 - 6.0.100-rtm.21504.1 + 6.0.100-rtm.21504.8 @@ -44,44 +44,44 @@ - 6.0.0-rtm.21501.15 - 6.0.0-rtm.21501.15 - 6.0.0-rtm.21501.15 - 6.0.0-rtm.21501.15 - 6.0.0-rtm.21501.15 - 6.0.0-rtm.21501.15 + 6.0.0-rtm.21507.1 + 6.0.0-rtm.21507.1 + 6.0.0-rtm.21507.1 + 6.0.0-rtm.21507.1 + 6.0.0-rtm.21507.1 + 6.0.0-rtm.21507.1 0.2.0 - 6.0.100-rtm.21504.6 - 6.0.100-rtm.21504.6 + 6.0.100-rtm.21507.9 + 6.0.100-rtm.21507.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 6.0.0-rtm.21504.6 + 6.0.0-rtm.21506.22 - 6.0.0-rtm.21504.6 - 6.0.0-rtm.21504.6 - 6.0.0-rtm.21504.6 - 6.0.0-rtm.21504.6 - 6.0.0-rtm.21504.6 - 6.0.0-rtm.21504.6 + 6.0.0-rtm.21506.22 + 6.0.0-rtm.21506.22 + 6.0.0-rtm.21506.22 + 6.0.0-rtm.21506.22 + 6.0.0-rtm.21506.22 + 6.0.0-rtm.21506.22 2.1.0 - 6.0.0-rtm.21501.4 - 6.0.0-rtm.21501.4 - 6.0.0-rtm.21501.4 - 6.0.0-rtm.21501.4 + 6.0.0-rtm.21505.6 + 6.0.0-rtm.21505.6 + 6.0.0-rtm.21505.6 + 6.0.0-rtm.21505.6 @@ -113,7 +113,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.100-rtm.21504.1 + 6.0.100-rtm.21504.8 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftDotnetWinFormsProjectTemplatesPackageVersion) diff --git a/src/SourceBuild/tarball/patches/runtime/0001-Enable-doc-generation-in-source-build.patch b/src/SourceBuild/tarball/patches/runtime/0001-Enable-doc-generation-in-source-build.patch deleted file mode 100644 index 47c00310d..000000000 --- a/src/SourceBuild/tarball/patches/runtime/0001-Enable-doc-generation-in-source-build.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 4ca12d74308dceface792dad959bd4a7eda0b1b4 Mon Sep 17 00:00:00 2001 -From: MichaelSimons -Date: Thu, 30 Sep 2021 22:37:24 +0000 -Subject: [PATCH] Enable doc generation in source-build - ---- - Build.proj | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Build.proj b/Build.proj -index bff94b97a7a..5f47e869fb6 100644 ---- a/Build.proj -+++ b/Build.proj -@@ -10,7 +10,7 @@ - - - -- -+ - - - 4.0.5 5.0.2 - 6.0.0-rtm.21504.6 + 6.0.0-rtm.21506.22 - 1.0.0-preview1.1.21112.1 + 1.0.0-preview1.1.21112.1 4.6.0 @@ -35,7 +35,7 @@ index b27862fb9d..539e127a63 100644 - + - + diff --git a/src/Resolvers/Microsoft.DotNet.MSBuildSdkResolver/Microsoft.DotNet.MSBuildSdkResolver.csproj b/src/Resolvers/Microsoft.DotNet.MSBuildSdkResolver/Microsoft.DotNet.MSBuildSdkResolver.csproj From b87ae17706e25abed13360a098432b733327248f Mon Sep 17 00:00:00 2001 From: Omair Majid Date: Thu, 7 Oct 2021 14:13:50 -0400 Subject: [PATCH 115/140] Document how to build source-build (#12242) I have seen questions about this from some FreeBSD folks as well as some folks at Red Hat. Let's just document it here. --- README.md | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/README.md b/README.md index a80993464..9e2556677 100644 --- a/README.md +++ b/README.md @@ -36,6 +36,26 @@ The repository contains native code project required for the Windows installer. - To build in VS, run a command line build first, then run `artifacts\core-sdk-build-env.bat` from a VS command prompt and then `devenv Microsoft.DotNet.Cli.sln` - To test different languages of the installer, run `artifacts\packages\Debug\Shipping>dotnet-sdk-3.1.412-win-x64.exe /lang 1046` using the LCID of the language you want to test +# Building (source-build) + +This repo also contains code to help you build the entire .NET product end-to-end from sources (often referred to as source-build), even in disconnected/offline mode. This is currently only tested on Linux. + +1. `./build.sh /p:ArcadeBuildTarball=true /p:TarballDir=/path/to/place/complete/dotnet/sources` + + This fetches the complete set of source code used to build the .NET SDK. It creates a tarball of the complete .NET source code at `artifacts/packages//Shipping/`. It also places the extracted sources at `/path/to/place/complete/dotnet/sources`. Due to a few known issues, that source directory should be outside (and not somewhere under) this repository. + +2. `cd /path/to/complete/dotnet/sources` + +3. `./prep.sh --bootstrap` + + This downloads a .NET SDK and a number of .NET packages and other prebuilts needed to build .NET from source. + + Eventually, we want to make it possible to bootstrap .NET 6 in which case this step can be skipped. + +4. `./build.sh` + + This builds the entire .NET SDK. The resulting SDK is placed at `artifacts/$ARCH/Release/dotnet-sdk-$VERSION-$ARCH.tar.gz`. + # Build status |All legs| From 62facc1027290ed8ae6589d8b08037c30bdd79fd Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 7 Oct 2021 18:45:24 +0000 Subject: [PATCH 116/140] Update dependencies from https://github.com/dotnet/arcade build 20211007.1 (#12262) [release/6.0.1xx] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- global.json | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 95081d051..76dc22b2c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -197,19 +197,19 @@ - + https://github.com/dotnet/arcade - c575da80f465e0b5fb98f416be92bb98b2f54b41 + e58cb829bf6d9c340b4a0c100956e2995d792aa2 - + https://github.com/dotnet/arcade - c575da80f465e0b5fb98f416be92bb98b2f54b41 + e58cb829bf6d9c340b4a0c100956e2995d792aa2 - + https://github.com/dotnet/arcade - c575da80f465e0b5fb98f416be92bb98b2f54b41 + e58cb829bf6d9c340b4a0c100956e2995d792aa2 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 844a541b2..01d0ff40c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,7 +19,7 @@ - 6.0.0-beta.21473.5 + 6.0.0-beta.21507.1 diff --git a/global.json b/global.json index 745453058..57ecd2983 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21473.5", - "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.21473.5" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21507.1", + "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.21507.1" } } From ae70ef3cf5a5d3d9fdae754c5b406b9e3db18f76 Mon Sep 17 00:00:00 2001 From: Chris Rummel Date: Thu, 7 Oct 2021 18:09:24 -0500 Subject: [PATCH 117/140] Temporarily disable package validation to prevent two tasks clashing and causing a file-in-use error. --- src/SourceBuild/tarball/content/repos/aspnetcore.proj | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/SourceBuild/tarball/content/repos/aspnetcore.proj b/src/SourceBuild/tarball/content/repos/aspnetcore.proj index 8be2152e4..72389f7e8 100644 --- a/src/SourceBuild/tarball/content/repos/aspnetcore.proj +++ b/src/SourceBuild/tarball/content/repos/aspnetcore.proj @@ -12,6 +12,9 @@ $(BuildCommandArgs) /p:MicrosoftNetFrameworkReferenceAssembliesVersion=1.0.0 + + $(BuildCommandArgs) /p:EnablePackageValidation=false $(ProjectDirectory)\eng\build$(ShellExtension) $(BuildCommandArgs) true From 39c6c2cb8925a632d6233dd5b7ba512148a5e042 Mon Sep 17 00:00:00 2001 From: MichaelSimons Date: Fri, 8 Oct 2021 12:02:37 +0000 Subject: [PATCH 118/140] Disable offline and smoke-tests in CI --- .../job/source-build-run-tarball-build.yml | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml index a6d2f8690..bb734e529 100644 --- a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml +++ b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml @@ -27,9 +27,13 @@ jobs: Fedora33-Online: _runOnline: true _Container: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-33-20210222183538-031e7d2 - Fedora33-Offline: - _runOnline: false - _Container: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-33-20210222183538-031e7d2 + + # TODO: Don't run offline in Pr validation until prebuilts are stabilized/removed, otherwise dependency flow continuously breaks PR validation. + # https://github.com/dotnet/source-build/issues/2490 + ${{ if notin(variables['Build.Reason'], 'PullRequest') }}: + Fedora33-Offline: + _runOnline: false + _Container: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-33-20210222183538-031e7d2 timeoutInMinutes: 210 variables: _TarballDir: $(Build.StagingDirectory)/tarball @@ -86,11 +90,12 @@ jobs: artifact: $(Agent.JobName)_Artifacts_Attempt$(System.JobAttempt) displayName: Publish Source Build Artifacts - - script: | - set -x + # TODO: Re-enable once https://github.com/dotnet/source-build/issues/2489 is fixed. + # - script: | + # set -x - docker run --rm -v $(_TarballDir):/tarball -w /tarball $(_Container) ./build.sh --run-smoke-test - displayName: Run Tests + # docker run --rm -v $(_TarballDir):/tarball -w /tarball $(_Container) ./build.sh --run-smoke-test + # displayName: Run Tests - template: /src/SourceBuild/Arcade/eng/common/templates/steps/source-build-publish-logs.yml parameters: From bca0813ad9a5d0994626d1c162b176316ab6e89e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 8 Oct 2021 13:14:16 +0000 Subject: [PATCH 119/140] [release/6.0.1xx] Update dependencies from dotnet/sdk (#12263) [release/6.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.WindowsDesktop.App.Ref: from 6.0.0-rtm.21505.6 to 6.0.0-rtm.21507.15 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0: from 6.0.0-rtm.21505.6 to 6.0.0-rtm.21507.15 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0: from 6.0.0-rtm.21505.6 to 6.0.0-rtm.21507.15 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Ref: from 6.0.0-rtm.21506.22 to 6.0.0-rtm.21507.16 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.NetCore.TargetingPack.x64.6.0: from 6.0.0-rtm.21506.22 to 6.0.0-rtm.21507.16 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Runtime.win-x64: from 6.0.0-rtm.21506.22 to 6.0.0-rtm.21507.16 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Host.win-x64: from 6.0.0-rtm.21506.22 to 6.0.0-rtm.21507.16 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.DotNetHostResolver: from 6.0.0-rtm.21506.22 to 6.0.0-rtm.21507.16 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.Platforms: from 6.0.0-rtm.21506.22 to 6.0.0-rtm.21507.16 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref: from 6.0.0-rtm.21507.1 to 6.0.0-rtm.21507.16 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 6.0.0-rtm.21507.1 to 6.0.0-rtm.21507.16 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.0-rtm.21507.1 to 6.0.0-rtm.21507.16 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0: from 6.0.0-rtm.21507.1 to 6.0.0-rtm.21507.16 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 6.0.0-rtm.21507.1 to 6.0.0-rtm.21507.16 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 6.0.0-rtm.21507.1 to 6.0.0-rtm.21507.16 (parent: Microsoft.NET.Sdk) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.0-rtm.21505.6 to 6.0.0-rtm.21507.15 (parent: Microsoft.NET.Sdk) - Microsoft.Dotnet.WinForms.ProjectTemplates: from 6.0.0-rtm.21505.4 to 6.0.0-rtm.21507.10 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.0-rtm.21505.6 to 6.0.0-rtm.21507.15 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Wpf.ProjectTemplates: from 6.0.0-rtm.21505.8 to 6.0.0-rtm.21507.14 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.Build: from 17.0.0-preview-21501-01 to 17.0.0-preview-21507-06 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.0-rtm.21506.22 to 6.0.0-rtm.21507.16 (parent: Microsoft.NET.Sdk) - Resolve source-build patch conflicts - Merge branch 'darc-release/6.0.1xx-f658da10-b150-4bd3-8c2e-cb6d2453006b' of https://github.com/dotnet/installer into darc-release/6.0.1xx-f658da10-b150-4bd3-8c2e-cb6d2453006b - Resolve source-build patch conflicts --- eng/Version.Details.xml | 88 +++++++++---------- eng/Versions.props | 42 ++++----- ...able-host.pkg-subset-in-source-build.patch | 28 ------ ...tReleasesVersion-Versions.props-entr.patch | 68 -------------- 4 files changed, 65 insertions(+), 161 deletions(-) delete mode 100644 src/SourceBuild/tarball/patches/runtime/0003-Enable-host.pkg-subset-in-source-build.patch delete mode 100644 src/SourceBuild/tarball/patches/sdk/0001-Rename-DeploymentReleasesVersion-Versions.props-entr.patch diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 76dc22b2c..5d0c0dcf1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://github.com/dotnet/windowsdesktop - c8ae10e08f87b28ed3d936f67b87a4c7cb59142d + f59eb06eee1cacfe79d49d8a33db732236689a39 - + https://github.com/dotnet/windowsdesktop - c8ae10e08f87b28ed3d936f67b87a4c7cb59142d + f59eb06eee1cacfe79d49d8a33db732236689a39 - + https://github.com/dotnet/windowsdesktop - c8ae10e08f87b28ed3d936f67b87a4c7cb59142d + f59eb06eee1cacfe79d49d8a33db732236689a39 - + https://github.com/dotnet/windowsdesktop - c8ae10e08f87b28ed3d936f67b87a4c7cb59142d + f59eb06eee1cacfe79d49d8a33db732236689a39 - + https://github.com/dotnet/runtime - 7d6c1ef01013b7bedd4d51e4ec8241e862c271ae + 733a3089ec6945422caf06035c18ff700c9d51be - + https://github.com/dotnet/runtime - 7d6c1ef01013b7bedd4d51e4ec8241e862c271ae + 733a3089ec6945422caf06035c18ff700c9d51be - + https://github.com/dotnet/runtime - 7d6c1ef01013b7bedd4d51e4ec8241e862c271ae + 733a3089ec6945422caf06035c18ff700c9d51be - + https://github.com/dotnet/runtime - 7d6c1ef01013b7bedd4d51e4ec8241e862c271ae + 733a3089ec6945422caf06035c18ff700c9d51be - + https://github.com/dotnet/runtime - 7d6c1ef01013b7bedd4d51e4ec8241e862c271ae + 733a3089ec6945422caf06035c18ff700c9d51be - + https://github.com/dotnet/runtime - 7d6c1ef01013b7bedd4d51e4ec8241e862c271ae + 733a3089ec6945422caf06035c18ff700c9d51be @@ -48,34 +48,34 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 7d6c1ef01013b7bedd4d51e4ec8241e862c271ae + 733a3089ec6945422caf06035c18ff700c9d51be - + https://github.com/dotnet/aspnetcore - c2e28176ab4a615d714be839464ab18119c423e5 + 8d54fefa13be7413235592116872f332935d1fa0 - + https://github.com/dotnet/aspnetcore - c2e28176ab4a615d714be839464ab18119c423e5 + 8d54fefa13be7413235592116872f332935d1fa0 - + https://github.com/dotnet/aspnetcore - c2e28176ab4a615d714be839464ab18119c423e5 + 8d54fefa13be7413235592116872f332935d1fa0 - + https://github.com/dotnet/aspnetcore - c2e28176ab4a615d714be839464ab18119c423e5 + 8d54fefa13be7413235592116872f332935d1fa0 - + https://github.com/dotnet/aspnetcore - c2e28176ab4a615d714be839464ab18119c423e5 + 8d54fefa13be7413235592116872f332935d1fa0 - + https://github.com/dotnet/aspnetcore - c2e28176ab4a615d714be839464ab18119c423e5 + 8d54fefa13be7413235592116872f332935d1fa0 https://github.com/dotnet/test-templates @@ -103,23 +103,23 @@ https://github.com/dotnet/templating 72fe1caeed1d1fa68b721a42f16782e4ea0ca136 - + https://github.com/dotnet/sdk - 65ef52eeb53231d33c8f0eee2006641daffc0809 + bf2c083d113a76e01c0c73cbe68450026c18c304 - + https://github.com/dotnet/sdk - 65ef52eeb53231d33c8f0eee2006641daffc0809 + bf2c083d113a76e01c0c73cbe68450026c18c304 - + https://github.com/dotnet/winforms - a6350cb6faf614a4b2110b809bcda1859836ee46 + 90c886aefd0090420d1bc6761763441e142c837b - + https://github.com/dotnet/wpf - cd0308253a2f9df2e21db640e975fc2320b85e23 + ecbbb80e6028a4829ee01f255b4ff5425e9b90f8 https://github.com/dotnet/fsharp @@ -146,9 +146,9 @@ ae62c5fdc561eb991cb14d31b3d865fdf6465d94 - + https://github.com/dotnet/msbuild - bbcce1dff18a5c7cb8751ad240e921774b50ebeb + 6873d6956145ed66f8e9b9ed6ee13b7937e15b55 diff --git a/eng/Versions.props b/eng/Versions.props index 01d0ff40c..ea8806ebd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.0-rtm.21505.4 + 6.0.0-rtm.21507.10 - 6.0.0-rtm.21505.8 + 6.0.0-rtm.21507.14 @@ -44,44 +44,44 @@ - 6.0.0-rtm.21507.1 - 6.0.0-rtm.21507.1 - 6.0.0-rtm.21507.1 - 6.0.0-rtm.21507.1 - 6.0.0-rtm.21507.1 - 6.0.0-rtm.21507.1 + 6.0.0-rtm.21507.16 + 6.0.0-rtm.21507.16 + 6.0.0-rtm.21507.16 + 6.0.0-rtm.21507.16 + 6.0.0-rtm.21507.16 + 6.0.0-rtm.21507.16 0.2.0 - 6.0.100-rtm.21507.9 - 6.0.100-rtm.21507.9 + 6.0.100-rtm.21508.6 + 6.0.100-rtm.21508.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 6.0.0-rtm.21506.22 + 6.0.0-rtm.21507.16 - 6.0.0-rtm.21506.22 - 6.0.0-rtm.21506.22 - 6.0.0-rtm.21506.22 - 6.0.0-rtm.21506.22 - 6.0.0-rtm.21506.22 - 6.0.0-rtm.21506.22 + 6.0.0-rtm.21507.16 + 6.0.0-rtm.21507.16 + 6.0.0-rtm.21507.16 + 6.0.0-rtm.21507.16 + 6.0.0-rtm.21507.16 + 6.0.0-rtm.21507.16 2.1.0 - 6.0.0-rtm.21505.6 - 6.0.0-rtm.21505.6 - 6.0.0-rtm.21505.6 - 6.0.0-rtm.21505.6 + 6.0.0-rtm.21507.15 + 6.0.0-rtm.21507.15 + 6.0.0-rtm.21507.15 + 6.0.0-rtm.21507.15 diff --git a/src/SourceBuild/tarball/patches/runtime/0003-Enable-host.pkg-subset-in-source-build.patch b/src/SourceBuild/tarball/patches/runtime/0003-Enable-host.pkg-subset-in-source-build.patch deleted file mode 100644 index ce3649176..000000000 --- a/src/SourceBuild/tarball/patches/runtime/0003-Enable-host.pkg-subset-in-source-build.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 0e68346f6127a82cf54e910ddea9889a56ca9e21 Mon Sep 17 00:00:00 2001 -From: MichaelSimons -Date: Wed, 6 Oct 2021 15:32:45 +0000 -Subject: [PATCH] Enable host.pkg subset in source-build - -Backported to runtime with https://github.com/dotnet/runtime/pull/60069 ---- - eng/Subsets.props | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/eng/Subsets.props b/eng/Subsets.props -index c935f7c3a81..a7c5fb0e96e 100644 ---- a/eng/Subsets.props -+++ b/eng/Subsets.props -@@ -66,8 +66,8 @@ - $(DefaultLibrariesSubsets)libs.ref+libs.src - $(DefaultLibrariesSubsets)+libs.pretest - -- host.native+host.tools -- $(DefaultHostSubsets)+host.pkg+host.tests -+ host.native+host.tools+host.pkg -+ $(DefaultHostSubsets)+host.tests - - host.native - --- -2.29.2 - diff --git a/src/SourceBuild/tarball/patches/sdk/0001-Rename-DeploymentReleasesVersion-Versions.props-entr.patch b/src/SourceBuild/tarball/patches/sdk/0001-Rename-DeploymentReleasesVersion-Versions.props-entr.patch deleted file mode 100644 index 4ac46a7b2..000000000 --- a/src/SourceBuild/tarball/patches/sdk/0001-Rename-DeploymentReleasesVersion-Versions.props-entr.patch +++ /dev/null @@ -1,68 +0,0 @@ -From 242806d708f4fff996e17185b570bd7d5d934a74 Mon Sep 17 00:00:00 2001 -From: MichaelSimons -Date: Tue, 28 Sep 2021 15:45:44 +0000 -Subject: [PATCH] Rename DeploymentReleasesVersion Versions.props entry to - align with Arcade naming convention - -Backported to SDK with https://github.com/dotnet/sdk/pull/21502 ---- - eng/Versions.props | 2 +- - src/Cli/dotnet/dotnet.csproj | 2 +- - .../Microsoft.DotNet.MSBuildSdkResolver.csproj | 2 +- - .../Microsoft.DotNet.NativeWrapper.csproj | 2 +- - 4 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/eng/Versions.props b/eng/Versions.props -index 0a7442c7c4..741b654ec4 100644 ---- a/eng/Versions.props -+++ b/eng/Versions.props -@@ -36,7 +36,7 @@ - 4.0.5 - 5.0.2 - 6.0.0-rtm.21506.22 -- 1.0.0-preview1.1.21112.1 -+ 1.0.0-preview1.1.21112.1 - 4.6.0 - 2.0.0-beta1.21473.1 - -diff --git a/src/Cli/dotnet/dotnet.csproj b/src/Cli/dotnet/dotnet.csproj -index b27862fb9d..539e127a63 100644 ---- a/src/Cli/dotnet/dotnet.csproj -+++ b/src/Cli/dotnet/dotnet.csproj -@@ -93,7 +93,7 @@ - - - -- -+ - - - -diff --git a/src/Resolvers/Microsoft.DotNet.MSBuildSdkResolver/Microsoft.DotNet.MSBuildSdkResolver.csproj b/src/Resolvers/Microsoft.DotNet.MSBuildSdkResolver/Microsoft.DotNet.MSBuildSdkResolver.csproj -index de9c3d5cd2..cf53c33fe5 100644 ---- a/src/Resolvers/Microsoft.DotNet.MSBuildSdkResolver/Microsoft.DotNet.MSBuildSdkResolver.csproj -+++ b/src/Resolvers/Microsoft.DotNet.MSBuildSdkResolver/Microsoft.DotNet.MSBuildSdkResolver.csproj -@@ -56,7 +56,7 @@ - - - -- -+ - - - -diff --git a/src/Resolvers/Microsoft.DotNet.NativeWrapper/Microsoft.DotNet.NativeWrapper.csproj b/src/Resolvers/Microsoft.DotNet.NativeWrapper/Microsoft.DotNet.NativeWrapper.csproj -index a97b55bb23..cb2affc131 100644 ---- a/src/Resolvers/Microsoft.DotNet.NativeWrapper/Microsoft.DotNet.NativeWrapper.csproj -+++ b/src/Resolvers/Microsoft.DotNet.NativeWrapper/Microsoft.DotNet.NativeWrapper.csproj -@@ -10,6 +10,6 @@ - - - -- -+ - - --- -2.29.2 - From ce747aceb44b53b15407e1f1b79660490b3eadd5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 8 Oct 2021 13:59:47 +0000 Subject: [PATCH 120/140] Update dependencies from https://github.com/dotnet/sdk build 20211008.9 (#12266) [release/6.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.AspNetCore.App.Ref: from 6.0.0-rtm.21507.16 to 6.0.0-rtm.21508.2 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 6.0.0-rtm.21507.16 to 6.0.0-rtm.21508.2 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.0-rtm.21507.16 to 6.0.0-rtm.21508.2 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0: from 6.0.0-rtm.21507.16 to 6.0.0-rtm.21508.2 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 6.0.0-rtm.21507.16 to 6.0.0-rtm.21508.2 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 6.0.0-rtm.21507.16 to 6.0.0-rtm.21508.2 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Common.ItemTemplates: from 6.0.100-rtm.21504.8 to 6.0.100-rtm.21508.1 (parent: Microsoft.NET.Sdk) - Microsoft.TemplateEngine.Cli: from 6.0.100-rtm.21504.8 to 6.0.100-rtm.21508.1 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Common.ProjectTemplates.6.0: from 6.0.100-rtm.21504.8 to 6.0.100-rtm.21508.1 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 44 ++++++++++++++++++++--------------------- eng/Versions.props | 20 +++++++++---------- 2 files changed, 32 insertions(+), 32 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5d0c0dcf1..4cdf78160 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -52,30 +52,30 @@ https://github.com/dotnet/runtime 733a3089ec6945422caf06035c18ff700c9d51be - + https://github.com/dotnet/aspnetcore - 8d54fefa13be7413235592116872f332935d1fa0 + 51b4a16582996642486686f18f0c4d3ddc0f152f - + https://github.com/dotnet/aspnetcore - 8d54fefa13be7413235592116872f332935d1fa0 + 51b4a16582996642486686f18f0c4d3ddc0f152f - + https://github.com/dotnet/aspnetcore - 8d54fefa13be7413235592116872f332935d1fa0 + 51b4a16582996642486686f18f0c4d3ddc0f152f - + https://github.com/dotnet/aspnetcore - 8d54fefa13be7413235592116872f332935d1fa0 + 51b4a16582996642486686f18f0c4d3ddc0f152f - + https://github.com/dotnet/aspnetcore - 8d54fefa13be7413235592116872f332935d1fa0 + 51b4a16582996642486686f18f0c4d3ddc0f152f - + https://github.com/dotnet/aspnetcore - 8d54fefa13be7413235592116872f332935d1fa0 + 51b4a16582996642486686f18f0c4d3ddc0f152f https://github.com/dotnet/test-templates @@ -90,27 +90,27 @@ c40ef7e056b48e011c43a21354d6790ba6b8b4fc - + https://github.com/dotnet/templating - 72fe1caeed1d1fa68b721a42f16782e4ea0ca136 + 6264ef82a348668801f8418bcc5b1163855fd057 - + https://github.com/dotnet/templating - 72fe1caeed1d1fa68b721a42f16782e4ea0ca136 + 6264ef82a348668801f8418bcc5b1163855fd057 - + https://github.com/dotnet/templating - 72fe1caeed1d1fa68b721a42f16782e4ea0ca136 + 6264ef82a348668801f8418bcc5b1163855fd057 - + https://github.com/dotnet/sdk - bf2c083d113a76e01c0c73cbe68450026c18c304 + febcaad293be5bdbdb1b84c11f5da41b34512303 - + https://github.com/dotnet/sdk - bf2c083d113a76e01c0c73cbe68450026c18c304 + febcaad293be5bdbdb1b84c11f5da41b34512303 diff --git a/eng/Versions.props b/eng/Versions.props index ea8806ebd..709e1e407 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,7 +31,7 @@ - 6.0.100-rtm.21504.8 + 6.0.100-rtm.21508.1 @@ -44,20 +44,20 @@ - 6.0.0-rtm.21507.16 - 6.0.0-rtm.21507.16 - 6.0.0-rtm.21507.16 - 6.0.0-rtm.21507.16 - 6.0.0-rtm.21507.16 - 6.0.0-rtm.21507.16 + 6.0.0-rtm.21508.2 + 6.0.0-rtm.21508.2 + 6.0.0-rtm.21508.2 + 6.0.0-rtm.21508.2 + 6.0.0-rtm.21508.2 + 6.0.0-rtm.21508.2 0.2.0 - 6.0.100-rtm.21508.6 - 6.0.100-rtm.21508.6 + 6.0.100-rtm.21508.9 + 6.0.100-rtm.21508.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -113,7 +113,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.100-rtm.21504.8 + 6.0.100-rtm.21508.1 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftDotnetWinFormsProjectTemplatesPackageVersion) From 9b5a17d50ddb80bdad2a453e64c7604d7b9341e3 Mon Sep 17 00:00:00 2001 From: dseefeld Date: Fri, 8 Oct 2021 10:09:04 -0500 Subject: [PATCH 121/140] Update dependency from dotnet/source-build-reference-packages --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7ec2ca04d..a14840072 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -211,9 +211,9 @@ https://github.com/dotnet/arcade e58cb829bf6d9c340b4a0c100956e2995d792aa2 - + https://github.com/dotnet/source-build-reference-packages - 8468769b427d87f46501993de206bfb39265d432 + 5334f439e93c93244c5e2ef97b953491a0dbcf09 From 29aa5e20a68dc9c200cd7f43090b81ad66762a6d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 8 Oct 2021 19:09:58 +0000 Subject: [PATCH 122/140] Update dependencies from https://github.com/dotnet/sdk build 20211008.14 (#12269) [release/6.0.1xx] Update dependencies from dotnet/sdk --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a14840072..87c9ad4ee 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 6264ef82a348668801f8418bcc5b1163855fd057 - + https://github.com/dotnet/sdk - febcaad293be5bdbdb1b84c11f5da41b34512303 + 7e3606014db1e1820596ce0bd2c33857fcb9fc61 - + https://github.com/dotnet/sdk - febcaad293be5bdbdb1b84c11f5da41b34512303 + 7e3606014db1e1820596ce0bd2c33857fcb9fc61 diff --git a/eng/Versions.props b/eng/Versions.props index 709e1e407..a715a03ce 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.100-rtm.21508.9 - 6.0.100-rtm.21508.9 + 6.0.100-rtm.21508.14 + 6.0.100-rtm.21508.14 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 06b92623cabc1ffba18a2a6c12639310d8fd5a47 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 8 Oct 2021 19:57:05 +0000 Subject: [PATCH 123/140] Update dependencies from https://github.com/dotnet/sdk build 20211008.16 (#12270) [release/6.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - NuGet.Build.Tasks: from 6.0.0-rc.258 to 6.0.0-rc.262 (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 87c9ad4ee..e543c0cba 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 6264ef82a348668801f8418bcc5b1163855fd057 - + https://github.com/dotnet/sdk - 7e3606014db1e1820596ce0bd2c33857fcb9fc61 + 7dfdf22d8a00caf641642aaeb5ca8aff76531e74 - + https://github.com/dotnet/sdk - 7e3606014db1e1820596ce0bd2c33857fcb9fc61 + 7dfdf22d8a00caf641642aaeb5ca8aff76531e74 @@ -151,9 +151,9 @@ 6873d6956145ed66f8e9b9ed6ee13b7937e15b55 - + https://github.com/nuget/nuget.client - e685bdb6d7b4d1f3664f6542f50b84376a19341c + e3016693e01536996921d613152648d66eb0ce99 diff --git a/eng/Versions.props b/eng/Versions.props index a715a03ce..b1ae5a27e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.100-rtm.21508.14 - 6.0.100-rtm.21508.14 + 6.0.100-rtm.21508.16 + 6.0.100-rtm.21508.16 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 44345027e4e3219833c1f6b0d828fecb00df9eea Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 8 Oct 2021 20:42:37 +0000 Subject: [PATCH 124/140] Update dependencies from https://github.com/dotnet/sdk build 20211008.18 (#12272) [release/6.0.1xx] Update dependencies from dotnet/sdk --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e543c0cba..c58ac7aba 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 6264ef82a348668801f8418bcc5b1163855fd057 - + https://github.com/dotnet/sdk - 7dfdf22d8a00caf641642aaeb5ca8aff76531e74 + a39155e751658af9a8fbb6ba5d0aff214f04b1db - + https://github.com/dotnet/sdk - 7dfdf22d8a00caf641642aaeb5ca8aff76531e74 + a39155e751658af9a8fbb6ba5d0aff214f04b1db diff --git a/eng/Versions.props b/eng/Versions.props index b1ae5a27e..4b2dc4a42 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.100-rtm.21508.16 - 6.0.100-rtm.21508.16 + 6.0.100-rtm.21508.18 + 6.0.100-rtm.21508.18 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 8fda9c693c1aa4e4f6e3554a585150ae478054c9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 8 Oct 2021 22:03:21 +0000 Subject: [PATCH 125/140] Update dependencies from https://github.com/dotnet/sdk build 20211008.20 (#12273) [release/6.0.1xx] Update dependencies from dotnet/sdk --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c58ac7aba..439517e91 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 6264ef82a348668801f8418bcc5b1163855fd057 - + https://github.com/dotnet/sdk - a39155e751658af9a8fbb6ba5d0aff214f04b1db + 5d918b81b53de23c6afab95f2f2750cb027db676 - + https://github.com/dotnet/sdk - a39155e751658af9a8fbb6ba5d0aff214f04b1db + 5d918b81b53de23c6afab95f2f2750cb027db676 diff --git a/eng/Versions.props b/eng/Versions.props index 4b2dc4a42..0ca74db2c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.100-rtm.21508.18 - 6.0.100-rtm.21508.18 + 6.0.100-rtm.21508.20 + 6.0.100-rtm.21508.20 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From e0343e851a6dd66bbae5abc2509a446c02847e5d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 8 Oct 2021 22:43:53 +0000 Subject: [PATCH 126/140] Update dependencies from https://github.com/dotnet/sdk build 20211008.24 (#12274) [release/6.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.NETCore.App.Ref: from 6.0.0-rtm.21507.16 to 6.0.0-rtm.21508.5 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.NetCore.TargetingPack.x64.6.0: from 6.0.0-rtm.21507.16 to 6.0.0-rtm.21508.5 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Runtime.win-x64: from 6.0.0-rtm.21507.16 to 6.0.0-rtm.21508.5 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Host.win-x64: from 6.0.0-rtm.21507.16 to 6.0.0-rtm.21508.5 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.DotNetHostResolver: from 6.0.0-rtm.21507.16 to 6.0.0-rtm.21508.5 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.Platforms: from 6.0.0-rtm.21507.16 to 6.0.0-rtm.21508.5 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.0-rtm.21507.16 to 6.0.0-rtm.21508.5 (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 439517e91..1e953b575 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://github.com/dotnet/windowsdesktop f59eb06eee1cacfe79d49d8a33db732236689a39 - + https://github.com/dotnet/runtime - 733a3089ec6945422caf06035c18ff700c9d51be + 9dfda4fd9e72d979f7a8c596544b5d805f4f8537 - + https://github.com/dotnet/runtime - 733a3089ec6945422caf06035c18ff700c9d51be + 9dfda4fd9e72d979f7a8c596544b5d805f4f8537 - + https://github.com/dotnet/runtime - 733a3089ec6945422caf06035c18ff700c9d51be + 9dfda4fd9e72d979f7a8c596544b5d805f4f8537 - + https://github.com/dotnet/runtime - 733a3089ec6945422caf06035c18ff700c9d51be + 9dfda4fd9e72d979f7a8c596544b5d805f4f8537 - + https://github.com/dotnet/runtime - 733a3089ec6945422caf06035c18ff700c9d51be + 9dfda4fd9e72d979f7a8c596544b5d805f4f8537 - + https://github.com/dotnet/runtime - 733a3089ec6945422caf06035c18ff700c9d51be + 9dfda4fd9e72d979f7a8c596544b5d805f4f8537 @@ -48,9 +48,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 733a3089ec6945422caf06035c18ff700c9d51be + 9dfda4fd9e72d979f7a8c596544b5d805f4f8537 https://github.com/dotnet/aspnetcore @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 6264ef82a348668801f8418bcc5b1163855fd057 - + https://github.com/dotnet/sdk - 5d918b81b53de23c6afab95f2f2750cb027db676 + c7027d0326698732c141d70edf0ac6443784ec55 - + https://github.com/dotnet/sdk - 5d918b81b53de23c6afab95f2f2750cb027db676 + c7027d0326698732c141d70edf0ac6443784ec55 diff --git a/eng/Versions.props b/eng/Versions.props index 0ca74db2c..adfcb5538 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,24 +56,24 @@ - 6.0.100-rtm.21508.20 - 6.0.100-rtm.21508.20 + 6.0.100-rtm.21508.24 + 6.0.100-rtm.21508.24 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 6.0.0-rtm.21507.16 + 6.0.0-rtm.21508.5 - 6.0.0-rtm.21507.16 - 6.0.0-rtm.21507.16 - 6.0.0-rtm.21507.16 - 6.0.0-rtm.21507.16 - 6.0.0-rtm.21507.16 - 6.0.0-rtm.21507.16 + 6.0.0-rtm.21508.5 + 6.0.0-rtm.21508.5 + 6.0.0-rtm.21508.5 + 6.0.0-rtm.21508.5 + 6.0.0-rtm.21508.5 + 6.0.0-rtm.21508.5 2.1.0 From 784fb8b9962c6ca0cf688412568bc5af06dc5946 Mon Sep 17 00:00:00 2001 From: MichaelSimons Date: Mon, 11 Oct 2021 16:18:40 +0000 Subject: [PATCH 127/140] Remove source-build obsolete bootstrapping patches --- ...warnings-as-errors-from-source-build.patch | 34 ------------------- ...til-DeploymentTools-is-in-SourceBuil.patch | 27 --------------- 2 files changed, 61 deletions(-) delete mode 100644 src/SourceBuild/tarball/patches/aspnetcore/0003-Exclude-warnings-as-errors-from-source-build.patch delete mode 100644 src/SourceBuild/tarball/patches/sdk/0002-NoWarn-NU1605-until-DeploymentTools-is-in-SourceBuil.patch diff --git a/src/SourceBuild/tarball/patches/aspnetcore/0003-Exclude-warnings-as-errors-from-source-build.patch b/src/SourceBuild/tarball/patches/aspnetcore/0003-Exclude-warnings-as-errors-from-source-build.patch deleted file mode 100644 index cd82ffb9f..000000000 --- a/src/SourceBuild/tarball/patches/aspnetcore/0003-Exclude-warnings-as-errors-from-source-build.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 6fce3b3afda68cd041cb3b38c8c21fa0513ab5e3 Mon Sep 17 00:00:00 2001 -From: Michael Simons -Date: Mon, 2 Aug 2021 19:56:17 +0000 -Subject: [PATCH] Exclude warnings as errors from source build - - -NU1604: These hopefully go away once runtime-portable is added to the tarball. - Microsoft.AspNetCore.App.Runtime.csproj : error NU1604: Project dependency Microsoft.NETCore.App.Crossgen2.linux-x64 does not contain an inclusive lower bound. Include a lower bound in the dependency version to ensure consistent restore results. - Microsoft.AspNetCore.App.Runtime.csproj : error NU1604: Project dependency Microsoft.NETCore.App.Runtime.linux-x64 does not contain an inclusive lower bound. Include a lower bound in the dependency version to ensure consistent restore results. - -CS8601: - CascadingAuthenticationState.razor(4,108): error CS8601: Possible null reference assignment. ---- - Directory.Build.props | 4 ++++++++++++++ - 1 file changed, 4 insertions(+) - -diff --git a/Directory.Build.props b/Directory.Build.props -index ba1c1675a0..ce6bc50c66 100644 ---- a/Directory.Build.props -+++ b/Directory.Build.props -@@ -225,6 +225,10 @@ - .zip - - -+ -+ $(NoWarn);NU1604;CS8601 -+ -+ - - - --- -2.29.2 - diff --git a/src/SourceBuild/tarball/patches/sdk/0002-NoWarn-NU1605-until-DeploymentTools-is-in-SourceBuil.patch b/src/SourceBuild/tarball/patches/sdk/0002-NoWarn-NU1605-until-DeploymentTools-is-in-SourceBuil.patch deleted file mode 100644 index 07af492d3..000000000 --- a/src/SourceBuild/tarball/patches/sdk/0002-NoWarn-NU1605-until-DeploymentTools-is-in-SourceBuil.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 4d2c2370dc85e658508fd0943e47b0d6559f42d5 Mon Sep 17 00:00:00 2001 -From: Michael Simons -Date: Mon, 9 Aug 2021 14:03:33 +0000 -Subject: [PATCH] NoWarn NU1605 until DeploymentTools is in SourceBuild - -src/Cli/dotnet/dotnet.csproj : error NU1605: Detected package downgrade: Newtonsoft.Json from 12.0.3 to 12.0.2. Reference the package directly from the project to select a different version. - -Error stems from Microsoft.Deployment.DotNet.Releases not being source built and referencing a newer version. Temporary fix until the DeploymentTools repo is added to source-build (https://github.com/dotnet/source-build/issues/2365). ---- - src/Cli/dotnet/dotnet.csproj | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/Cli/dotnet/dotnet.csproj b/src/Cli/dotnet/dotnet.csproj -index 4ff965a4d..f9609824b 100644 ---- a/src/Cli/dotnet/dotnet.csproj -+++ b/src/Cli/dotnet/dotnet.csproj -@@ -12,6 +12,7 @@ - Microsoft.DotNet.Cli - false - true -+ $(NoWarn);NU1605 - - - --- -2.29.2 - From 76be03c9ae26f99555bb5f8d61ba0b6d49cdff9c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 11 Oct 2021 16:43:10 +0000 Subject: [PATCH 128/140] [release/6.0.1xx] Update dependencies from dotnet/sdk (#12277) [release/6.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.WindowsDesktop.App.Ref: from 6.0.0-rtm.21507.15 to 6.0.0-rtm.21508.8 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0: from 6.0.0-rtm.21507.15 to 6.0.0-rtm.21508.8 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0: from 6.0.0-rtm.21507.15 to 6.0.0-rtm.21508.8 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Ref: from 6.0.0-rtm.21508.5 to 6.0.0-rtm.21510.5 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.NetCore.TargetingPack.x64.6.0: from 6.0.0-rtm.21508.5 to 6.0.0-rtm.21510.5 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Runtime.win-x64: from 6.0.0-rtm.21508.5 to 6.0.0-rtm.21510.5 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Host.win-x64: from 6.0.0-rtm.21508.5 to 6.0.0-rtm.21510.5 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.DotNetHostResolver: from 6.0.0-rtm.21508.5 to 6.0.0-rtm.21510.5 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.Platforms: from 6.0.0-rtm.21508.5 to 6.0.0-rtm.21510.5 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref: from 6.0.0-rtm.21508.2 to 6.0.0-rtm.21509.1 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 6.0.0-rtm.21508.2 to 6.0.0-rtm.21509.1 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.0-rtm.21508.2 to 6.0.0-rtm.21509.1 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0: from 6.0.0-rtm.21508.2 to 6.0.0-rtm.21509.1 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 6.0.0-rtm.21508.2 to 6.0.0-rtm.21509.1 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 6.0.0-rtm.21508.2 to 6.0.0-rtm.21509.1 (parent: Microsoft.NET.Sdk) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.0-rtm.21507.15 to 6.0.0-rtm.21508.8 (parent: Microsoft.NET.Sdk) - Microsoft.Dotnet.WinForms.ProjectTemplates: from 6.0.0-rtm.21507.10 to 6.0.0-rtm.21508.6 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.0-rtm.21507.15 to 6.0.0-rtm.21508.8 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Wpf.ProjectTemplates: from 6.0.0-rtm.21507.14 to 6.0.0-rtm.21508.9 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.Net.Compilers.Toolset: from 4.0.0-5.21505.4 to 4.0.0-5.21508.3 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.0-rtm.21508.5 to 6.0.0-rtm.21510.5 (parent: Microsoft.NET.Sdk) - Microsoft.NET.Workload.Emscripten.Manifest-6.0.100: from 6.0.0-rc.2.21474.1 to 6.0.0-rtm.21505.3 (parent: VS.Redist.Common.NetCore.SharedFramework.x64.6.0) - Resolve source-build patch conflicts --- eng/Version.Details.xml | 92 +++++++++---------- eng/Versions.props | 44 ++++----- .../0002-Produce-symbols-archives.patch | 42 --------- 3 files changed, 68 insertions(+), 110 deletions(-) delete mode 100644 src/SourceBuild/tarball/patches/runtime/0002-Produce-symbols-archives.patch diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1e953b575..2e62abefe 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://github.com/dotnet/windowsdesktop - f59eb06eee1cacfe79d49d8a33db732236689a39 + 5fafe4ad9308be98d8f78cc5bea094ab82d13f75 - + https://github.com/dotnet/windowsdesktop - f59eb06eee1cacfe79d49d8a33db732236689a39 + 5fafe4ad9308be98d8f78cc5bea094ab82d13f75 - + https://github.com/dotnet/windowsdesktop - f59eb06eee1cacfe79d49d8a33db732236689a39 + 5fafe4ad9308be98d8f78cc5bea094ab82d13f75 - + https://github.com/dotnet/windowsdesktop - f59eb06eee1cacfe79d49d8a33db732236689a39 + 5fafe4ad9308be98d8f78cc5bea094ab82d13f75 - + https://github.com/dotnet/runtime - 9dfda4fd9e72d979f7a8c596544b5d805f4f8537 + b1aedd5a54d0c54ec12afe98a41979fb053998a5 - + https://github.com/dotnet/runtime - 9dfda4fd9e72d979f7a8c596544b5d805f4f8537 + b1aedd5a54d0c54ec12afe98a41979fb053998a5 - + https://github.com/dotnet/runtime - 9dfda4fd9e72d979f7a8c596544b5d805f4f8537 + b1aedd5a54d0c54ec12afe98a41979fb053998a5 - + https://github.com/dotnet/runtime - 9dfda4fd9e72d979f7a8c596544b5d805f4f8537 + b1aedd5a54d0c54ec12afe98a41979fb053998a5 - + https://github.com/dotnet/runtime - 9dfda4fd9e72d979f7a8c596544b5d805f4f8537 + b1aedd5a54d0c54ec12afe98a41979fb053998a5 - + https://github.com/dotnet/runtime - 9dfda4fd9e72d979f7a8c596544b5d805f4f8537 + b1aedd5a54d0c54ec12afe98a41979fb053998a5 @@ -48,34 +48,34 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 9dfda4fd9e72d979f7a8c596544b5d805f4f8537 + b1aedd5a54d0c54ec12afe98a41979fb053998a5 - + https://github.com/dotnet/aspnetcore - 51b4a16582996642486686f18f0c4d3ddc0f152f + 617daed6e3959092ad7cad23e3ed3106b062de6f - + https://github.com/dotnet/aspnetcore - 51b4a16582996642486686f18f0c4d3ddc0f152f + 617daed6e3959092ad7cad23e3ed3106b062de6f - + https://github.com/dotnet/aspnetcore - 51b4a16582996642486686f18f0c4d3ddc0f152f + 617daed6e3959092ad7cad23e3ed3106b062de6f - + https://github.com/dotnet/aspnetcore - 51b4a16582996642486686f18f0c4d3ddc0f152f + 617daed6e3959092ad7cad23e3ed3106b062de6f - + https://github.com/dotnet/aspnetcore - 51b4a16582996642486686f18f0c4d3ddc0f152f + 617daed6e3959092ad7cad23e3ed3106b062de6f - + https://github.com/dotnet/aspnetcore - 51b4a16582996642486686f18f0c4d3ddc0f152f + 617daed6e3959092ad7cad23e3ed3106b062de6f https://github.com/dotnet/test-templates @@ -103,23 +103,23 @@ https://github.com/dotnet/templating 6264ef82a348668801f8418bcc5b1163855fd057 - + https://github.com/dotnet/sdk - c7027d0326698732c141d70edf0ac6443784ec55 + d465b3695145bfd48cc45b9763c20482f96b2b2b - + https://github.com/dotnet/sdk - c7027d0326698732c141d70edf0ac6443784ec55 + d465b3695145bfd48cc45b9763c20482f96b2b2b - + https://github.com/dotnet/winforms - 90c886aefd0090420d1bc6761763441e142c837b + 79c5a2a27ef68ea00a2b2b2b621b53fdc1da2575 - + https://github.com/dotnet/wpf - ecbbb80e6028a4829ee01f255b4ff5425e9b90f8 + 917c7da75caea7358388811269a58e5a54edcc9c https://github.com/dotnet/fsharp @@ -141,9 +141,9 @@ linker - + https://github.com/dotnet/roslyn - ae62c5fdc561eb991cb14d31b3d865fdf6465d94 + 66b241be4e8d900f8ccb8a15fdc60f249371e97d @@ -166,9 +166,9 @@ 698fdad58fa64a55f16cd9562c90224cc498ed02 - + https://github.com/dotnet/emsdk - 885a25579f723c790c1d91e4fc4939390429ccbc + fd04453453de7a7d5581f4f129de09ad6838d89e https://github.com/dotnet/source-build diff --git a/eng/Versions.props b/eng/Versions.props index adfcb5538..e6370d21b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.0-rtm.21507.10 + 6.0.0-rtm.21508.6 - 6.0.0-rtm.21507.14 + 6.0.0-rtm.21508.9 @@ -44,44 +44,44 @@ - 6.0.0-rtm.21508.2 - 6.0.0-rtm.21508.2 - 6.0.0-rtm.21508.2 - 6.0.0-rtm.21508.2 - 6.0.0-rtm.21508.2 - 6.0.0-rtm.21508.2 + 6.0.0-rtm.21509.1 + 6.0.0-rtm.21509.1 + 6.0.0-rtm.21509.1 + 6.0.0-rtm.21509.1 + 6.0.0-rtm.21509.1 + 6.0.0-rtm.21509.1 0.2.0 - 6.0.100-rtm.21508.24 - 6.0.100-rtm.21508.24 + 6.0.100-rtm.21511.1 + 6.0.100-rtm.21511.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 6.0.0-rtm.21508.5 + 6.0.0-rtm.21510.5 - 6.0.0-rtm.21508.5 - 6.0.0-rtm.21508.5 - 6.0.0-rtm.21508.5 - 6.0.0-rtm.21508.5 - 6.0.0-rtm.21508.5 - 6.0.0-rtm.21508.5 + 6.0.0-rtm.21510.5 + 6.0.0-rtm.21510.5 + 6.0.0-rtm.21510.5 + 6.0.0-rtm.21510.5 + 6.0.0-rtm.21510.5 + 6.0.0-rtm.21510.5 2.1.0 - 6.0.0-rtm.21507.15 - 6.0.0-rtm.21507.15 - 6.0.0-rtm.21507.15 - 6.0.0-rtm.21507.15 + 6.0.0-rtm.21508.8 + 6.0.0-rtm.21508.8 + 6.0.0-rtm.21508.8 + 6.0.0-rtm.21508.8 @@ -171,7 +171,7 @@ 12.0.101-preview.9.31 15.0.101-preview.9.31 $(MicrosoftNETCoreAppRefPackageVersion) - 6.0.0-rc.2.21474.1 + 6.0.0-rtm.21505.3 $(MicrosoftNETWorkloadEmscriptenManifest60100Version) diff --git a/src/SourceBuild/tarball/patches/runtime/0002-Produce-symbols-archives.patch b/src/SourceBuild/tarball/patches/runtime/0002-Produce-symbols-archives.patch deleted file mode 100644 index 4eb878225..000000000 --- a/src/SourceBuild/tarball/patches/runtime/0002-Produce-symbols-archives.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 7577b8cf676f7d38363052e2bc8da931af1cc279 Mon Sep 17 00:00:00 2001 -From: Jeremy Koritzinsky -Date: Thu, 30 Sep 2021 16:04:21 -0700 -Subject: [PATCH] Produce symbols archives. - -Contributes to #49026 - -https://github.com/dotnet/runtime/pull/59843 handles adding the patch to the runtime repo. ---- - .../Microsoft.NETCore.App.Runtime.Composite.sfxproj | 2 +- - .../Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.sfxproj | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.Composite.sfxproj b/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.Composite.sfxproj -index a3f364815d6..5fe3ba42252 100644 ---- a/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.Composite.sfxproj -+++ b/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.Composite.sfxproj -@@ -7,7 +7,7 @@ - dotnet-runtime-internal-composite - $(SharedFrameworkName).Composite - $(SharedFrameworkName).Composite.PGO -- true -+ true - dotnet-runtime-composite-symbols - true - true -diff --git a/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.sfxproj b/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.sfxproj -index 4fa48f4e0c9..1d43304d72b 100644 ---- a/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.sfxproj -+++ b/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.sfxproj -@@ -8,7 +8,7 @@ - dotnet-runtime - dotnet-runtime-internal - $(SharedFrameworkName).PGO -- true -+ true - dotnet-runtime-symbols - NetCore.SharedFramework - true --- -2.29.2 - From 18d694a877dea1f40ee485cfe7112e05cad5e7ce Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 11 Oct 2021 17:16:25 +0000 Subject: [PATCH 129/140] [release/6.0.1xx] Update dependencies from dotnet/sdk (#12288) [release/6.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.WindowsDesktop.App.Ref: from 6.0.0-rtm.21508.8 to 6.0.0-rtm.21511.2 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0: from 6.0.0-rtm.21508.8 to 6.0.0-rtm.21511.2 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0: from 6.0.0-rtm.21508.8 to 6.0.0-rtm.21511.2 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref: from 6.0.0-rtm.21509.1 to 6.0.0-rtm.21511.1 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 6.0.0-rtm.21509.1 to 6.0.0-rtm.21511.1 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.0-rtm.21509.1 to 6.0.0-rtm.21511.1 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0: from 6.0.0-rtm.21509.1 to 6.0.0-rtm.21511.1 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 6.0.0-rtm.21509.1 to 6.0.0-rtm.21511.1 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 6.0.0-rtm.21509.1 to 6.0.0-rtm.21511.1 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Common.ItemTemplates: from 6.0.100-rtm.21508.1 to 6.0.100-rtm.21511.1 (parent: Microsoft.NET.Sdk) - Microsoft.TemplateEngine.Cli: from 6.0.100-rtm.21508.1 to 6.0.100-rtm.21511.1 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Common.ProjectTemplates.6.0: from 6.0.100-rtm.21508.1 to 6.0.100-rtm.21511.1 (parent: Microsoft.NET.Sdk) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.0-rtm.21508.8 to 6.0.0-rtm.21511.2 (parent: Microsoft.NET.Sdk) - Microsoft.Dotnet.WinForms.ProjectTemplates: from 6.0.0-rtm.21508.6 to 6.0.0-rtm.21511.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.0-rtm.21508.8 to 6.0.0-rtm.21511.2 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Wpf.ProjectTemplates: from 6.0.0-rtm.21508.9 to 6.0.0-rtm.21511.3 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) --- eng/Version.Details.xml | 68 ++++++++++++++++++++--------------------- eng/Versions.props | 32 +++++++++---------- 2 files changed, 50 insertions(+), 50 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2e62abefe..f0d9bcb5e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,21 +1,21 @@ - + https://github.com/dotnet/windowsdesktop - 5fafe4ad9308be98d8f78cc5bea094ab82d13f75 + ed76339f9430a1a98760e7b959ddb0b212f07400 - + https://github.com/dotnet/windowsdesktop - 5fafe4ad9308be98d8f78cc5bea094ab82d13f75 + ed76339f9430a1a98760e7b959ddb0b212f07400 - + https://github.com/dotnet/windowsdesktop - 5fafe4ad9308be98d8f78cc5bea094ab82d13f75 + ed76339f9430a1a98760e7b959ddb0b212f07400 - + https://github.com/dotnet/windowsdesktop - 5fafe4ad9308be98d8f78cc5bea094ab82d13f75 + ed76339f9430a1a98760e7b959ddb0b212f07400 https://github.com/dotnet/runtime @@ -52,30 +52,30 @@ https://github.com/dotnet/runtime b1aedd5a54d0c54ec12afe98a41979fb053998a5 - + https://github.com/dotnet/aspnetcore - 617daed6e3959092ad7cad23e3ed3106b062de6f + f6b28a59ceb4c94384ab4cd4e40631b5ccb2a1f3 - + https://github.com/dotnet/aspnetcore - 617daed6e3959092ad7cad23e3ed3106b062de6f + f6b28a59ceb4c94384ab4cd4e40631b5ccb2a1f3 - + https://github.com/dotnet/aspnetcore - 617daed6e3959092ad7cad23e3ed3106b062de6f + f6b28a59ceb4c94384ab4cd4e40631b5ccb2a1f3 - + https://github.com/dotnet/aspnetcore - 617daed6e3959092ad7cad23e3ed3106b062de6f + f6b28a59ceb4c94384ab4cd4e40631b5ccb2a1f3 - + https://github.com/dotnet/aspnetcore - 617daed6e3959092ad7cad23e3ed3106b062de6f + f6b28a59ceb4c94384ab4cd4e40631b5ccb2a1f3 - + https://github.com/dotnet/aspnetcore - 617daed6e3959092ad7cad23e3ed3106b062de6f + f6b28a59ceb4c94384ab4cd4e40631b5ccb2a1f3 https://github.com/dotnet/test-templates @@ -90,36 +90,36 @@ c40ef7e056b48e011c43a21354d6790ba6b8b4fc - + https://github.com/dotnet/templating - 6264ef82a348668801f8418bcc5b1163855fd057 + 5cbb78707edf860fb9399b0e34cc982046012b2c - + https://github.com/dotnet/templating - 6264ef82a348668801f8418bcc5b1163855fd057 + 5cbb78707edf860fb9399b0e34cc982046012b2c - + https://github.com/dotnet/templating - 6264ef82a348668801f8418bcc5b1163855fd057 + 5cbb78707edf860fb9399b0e34cc982046012b2c - + https://github.com/dotnet/sdk - d465b3695145bfd48cc45b9763c20482f96b2b2b + d7805ffe7727eff0cd891fc2c40291d150b47135 - + https://github.com/dotnet/sdk - d465b3695145bfd48cc45b9763c20482f96b2b2b + d7805ffe7727eff0cd891fc2c40291d150b47135 - + https://github.com/dotnet/winforms - 79c5a2a27ef68ea00a2b2b2b621b53fdc1da2575 + ad1df8fd7c09ebabe3f6c6c41fad82cff43a3b50 - + https://github.com/dotnet/wpf - 917c7da75caea7358388811269a58e5a54edcc9c + 4455ff4633d4cd2a4ae99f76b1c24fe305aef4c5 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index e6370d21b..40b82d3a5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,15 +23,15 @@ - 6.0.0-rtm.21508.6 + 6.0.0-rtm.21511.2 - 6.0.0-rtm.21508.9 + 6.0.0-rtm.21511.3 - 6.0.100-rtm.21508.1 + 6.0.100-rtm.21511.1 @@ -44,20 +44,20 @@ - 6.0.0-rtm.21509.1 - 6.0.0-rtm.21509.1 - 6.0.0-rtm.21509.1 - 6.0.0-rtm.21509.1 - 6.0.0-rtm.21509.1 - 6.0.0-rtm.21509.1 + 6.0.0-rtm.21511.1 + 6.0.0-rtm.21511.1 + 6.0.0-rtm.21511.1 + 6.0.0-rtm.21511.1 + 6.0.0-rtm.21511.1 + 6.0.0-rtm.21511.1 0.2.0 - 6.0.100-rtm.21511.1 - 6.0.100-rtm.21511.1 + 6.0.100-rtm.21511.14 + 6.0.100-rtm.21511.14 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,10 +78,10 @@ - 6.0.0-rtm.21508.8 - 6.0.0-rtm.21508.8 - 6.0.0-rtm.21508.8 - 6.0.0-rtm.21508.8 + 6.0.0-rtm.21511.2 + 6.0.0-rtm.21511.2 + 6.0.0-rtm.21511.2 + 6.0.0-rtm.21511.2 @@ -113,7 +113,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.100-rtm.21508.1 + 6.0.100-rtm.21511.1 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftDotnetWinFormsProjectTemplatesPackageVersion) From f2ffbfed7ff660b1b73dc56120dd75497b037a6c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 11 Oct 2021 17:54:07 +0000 Subject: [PATCH 130/140] Update dependencies from https://github.com/dotnet/sdk build 20211011.16 (#12289) [release/6.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.AspNetCore.App.Ref: from 6.0.0-rtm.21511.1 to 6.0.0-rtm.21511.4 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 6.0.0-rtm.21511.1 to 6.0.0-rtm.21511.4 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.0-rtm.21511.1 to 6.0.0-rtm.21511.4 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0: from 6.0.0-rtm.21511.1 to 6.0.0-rtm.21511.4 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 6.0.0-rtm.21511.1 to 6.0.0-rtm.21511.4 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 6.0.0-rtm.21511.1 to 6.0.0-rtm.21511.4 (parent: Microsoft.NET.Sdk) --- 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 f0d9bcb5e..f5f29d81e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -52,30 +52,30 @@ https://github.com/dotnet/runtime b1aedd5a54d0c54ec12afe98a41979fb053998a5 - + https://github.com/dotnet/aspnetcore - f6b28a59ceb4c94384ab4cd4e40631b5ccb2a1f3 + 27825be06970a665d6390b320fd933a62aa6d518 - + https://github.com/dotnet/aspnetcore - f6b28a59ceb4c94384ab4cd4e40631b5ccb2a1f3 + 27825be06970a665d6390b320fd933a62aa6d518 - + https://github.com/dotnet/aspnetcore - f6b28a59ceb4c94384ab4cd4e40631b5ccb2a1f3 + 27825be06970a665d6390b320fd933a62aa6d518 - + https://github.com/dotnet/aspnetcore - f6b28a59ceb4c94384ab4cd4e40631b5ccb2a1f3 + 27825be06970a665d6390b320fd933a62aa6d518 - + https://github.com/dotnet/aspnetcore - f6b28a59ceb4c94384ab4cd4e40631b5ccb2a1f3 + 27825be06970a665d6390b320fd933a62aa6d518 - + https://github.com/dotnet/aspnetcore - f6b28a59ceb4c94384ab4cd4e40631b5ccb2a1f3 + 27825be06970a665d6390b320fd933a62aa6d518 https://github.com/dotnet/test-templates @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 5cbb78707edf860fb9399b0e34cc982046012b2c - + https://github.com/dotnet/sdk - d7805ffe7727eff0cd891fc2c40291d150b47135 + 5e1aa7ee599ac848e45c68379616ba206bdacc57 - + https://github.com/dotnet/sdk - d7805ffe7727eff0cd891fc2c40291d150b47135 + 5e1aa7ee599ac848e45c68379616ba206bdacc57 diff --git a/eng/Versions.props b/eng/Versions.props index 40b82d3a5..17e3c64ca 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,20 +44,20 @@ - 6.0.0-rtm.21511.1 - 6.0.0-rtm.21511.1 - 6.0.0-rtm.21511.1 - 6.0.0-rtm.21511.1 - 6.0.0-rtm.21511.1 - 6.0.0-rtm.21511.1 + 6.0.0-rtm.21511.4 + 6.0.0-rtm.21511.4 + 6.0.0-rtm.21511.4 + 6.0.0-rtm.21511.4 + 6.0.0-rtm.21511.4 + 6.0.0-rtm.21511.4 0.2.0 - 6.0.100-rtm.21511.14 - 6.0.100-rtm.21511.14 + 6.0.100-rtm.21511.16 + 6.0.100-rtm.21511.16 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 4d5bf60d91d40101c7a9c5f3f30661fdf6cd702c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 11 Oct 2021 18:29:42 +0000 Subject: [PATCH 131/140] Update dependencies from https://github.com/dotnet/sdk build 20211011.19 (#12291) [release/6.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.FSharp.Compiler: from 12.0.0-beta.21501.2 to 12.0.0-beta.21511.2 (parent: Microsoft.NET.Sdk) - Microsoft.SourceBuild.Intermediate.fsharp: from 6.0.0-beta.21501.2 to 6.0.0-beta.21511.2 (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 f5f29d81e..5e10f46d0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 5cbb78707edf860fb9399b0e34cc982046012b2c - + https://github.com/dotnet/sdk - 5e1aa7ee599ac848e45c68379616ba206bdacc57 + 4832fc67f24146f6da5457de9c5393e1d557040f - + https://github.com/dotnet/sdk - 5e1aa7ee599ac848e45c68379616ba206bdacc57 + 4832fc67f24146f6da5457de9c5393e1d557040f @@ -121,13 +121,13 @@ https://github.com/dotnet/wpf 4455ff4633d4cd2a4ae99f76b1c24fe305aef4c5 - + https://github.com/dotnet/fsharp - 6b04aa963d40befe43469d8f00172082ce959323 + 1f28ed6e9ee51810012eca60e0047647bd3c9e0d - + https://github.com/dotnet/fsharp - 6b04aa963d40befe43469d8f00172082ce959323 + 1f28ed6e9ee51810012eca60e0047647bd3c9e0d diff --git a/eng/Versions.props b/eng/Versions.props index 17e3c64ca..b7815999d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.100-rtm.21511.16 - 6.0.100-rtm.21511.16 + 6.0.100-rtm.21511.19 + 6.0.100-rtm.21511.19 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From b7df57c2b4b3ebb3d15275cff2047d3b71ceca6b Mon Sep 17 00:00:00 2001 From: Davis Goodin Date: Mon, 11 Oct 2021 15:08:32 -0500 Subject: [PATCH 132/140] [6.0.1xx] dotnet/arcade: Disable Workloads WiX dependency in source-build to remove prebuilt (#12290) --- ...loads-WiX-dependency-in-source-build.patch | 124 ++++++++++++++++++ 1 file changed, 124 insertions(+) create mode 100644 src/SourceBuild/tarball/patches/arcade/0009-Disable-Workloads-WiX-dependency-in-source-build.patch diff --git a/src/SourceBuild/tarball/patches/arcade/0009-Disable-Workloads-WiX-dependency-in-source-build.patch b/src/SourceBuild/tarball/patches/arcade/0009-Disable-Workloads-WiX-dependency-in-source-build.patch new file mode 100644 index 000000000..188312413 --- /dev/null +++ b/src/SourceBuild/tarball/patches/arcade/0009-Disable-Workloads-WiX-dependency-in-source-build.patch @@ -0,0 +1,124 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Davis Goodin +Date: Fri, 8 Oct 2021 16:15:42 -0700 +Subject: [PATCH] Disable Workloads WiX dependency in source-build + +This removes the prebuilt WiX dependency: https://github.com/dotnet/arcade/issues/8014 + +The patch is temporary, pending upstream fix and dependency flow. +--- + .../src/{FileRow.cs => FileRow.wix.cs} | 0 + ...ifestMsi.cs => GenerateManifestMsi.wix.cs} | 0 + .../{GenerateMsi.cs => GenerateMsi.wix.cs} | 0 + ...erateMsiBase.cs => GenerateMsiBase.wix.cs} | 0 + ...erateVisualStudioMsiPackageProject.wix.cs} | 0 + ...cs => GenerateVisualStudioWorkload.wix.cs} | 0 + ...oadMsis.cs => GenerateWorkloadMsis.wix.cs} | 0 + ...rosoft.DotNet.Build.Tasks.Workloads.csproj | 23 ++++++++++++++++--- + ...{MsiProperties.cs => MsiProperties.wix.cs} | 0 + .../src/{MsiUtils.cs => MsiUtils.wix.cs} | 0 + ...elatedProduct.cs => RelatedProduct.wix.cs} | 0 + 11 files changed, 20 insertions(+), 3 deletions(-) + rename src/Microsoft.DotNet.Build.Tasks.Workloads/src/{FileRow.cs => FileRow.wix.cs} (100%) + rename src/Microsoft.DotNet.Build.Tasks.Workloads/src/{GenerateManifestMsi.cs => GenerateManifestMsi.wix.cs} (100%) + rename src/Microsoft.DotNet.Build.Tasks.Workloads/src/{GenerateMsi.cs => GenerateMsi.wix.cs} (100%) + rename src/Microsoft.DotNet.Build.Tasks.Workloads/src/{GenerateMsiBase.cs => GenerateMsiBase.wix.cs} (100%) + rename src/Microsoft.DotNet.Build.Tasks.Workloads/src/{GenerateVisualStudioMsiPackageProject.cs => GenerateVisualStudioMsiPackageProject.wix.cs} (100%) + rename src/Microsoft.DotNet.Build.Tasks.Workloads/src/{GenerateVisualStudioWorkload.cs => GenerateVisualStudioWorkload.wix.cs} (100%) + rename src/Microsoft.DotNet.Build.Tasks.Workloads/src/{GenerateWorkloadMsis.cs => GenerateWorkloadMsis.wix.cs} (100%) + rename src/Microsoft.DotNet.Build.Tasks.Workloads/src/{MsiProperties.cs => MsiProperties.wix.cs} (100%) + rename src/Microsoft.DotNet.Build.Tasks.Workloads/src/{MsiUtils.cs => MsiUtils.wix.cs} (100%) + rename src/Microsoft.DotNet.Build.Tasks.Workloads/src/{RelatedProduct.cs => RelatedProduct.wix.cs} (100%) + +diff --git a/src/Microsoft.DotNet.Build.Tasks.Workloads/src/FileRow.cs b/src/Microsoft.DotNet.Build.Tasks.Workloads/src/FileRow.wix.cs +similarity index 100% +rename from src/Microsoft.DotNet.Build.Tasks.Workloads/src/FileRow.cs +rename to src/Microsoft.DotNet.Build.Tasks.Workloads/src/FileRow.wix.cs +diff --git a/src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateManifestMsi.cs b/src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateManifestMsi.wix.cs +similarity index 100% +rename from src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateManifestMsi.cs +rename to src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateManifestMsi.wix.cs +diff --git a/src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateMsi.cs b/src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateMsi.wix.cs +similarity index 100% +rename from src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateMsi.cs +rename to src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateMsi.wix.cs +diff --git a/src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateMsiBase.cs b/src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateMsiBase.wix.cs +similarity index 100% +rename from src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateMsiBase.cs +rename to src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateMsiBase.wix.cs +diff --git a/src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateVisualStudioMsiPackageProject.cs b/src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateVisualStudioMsiPackageProject.wix.cs +similarity index 100% +rename from src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateVisualStudioMsiPackageProject.cs +rename to src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateVisualStudioMsiPackageProject.wix.cs +diff --git a/src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateVisualStudioWorkload.cs b/src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateVisualStudioWorkload.wix.cs +similarity index 100% +rename from src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateVisualStudioWorkload.cs +rename to src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateVisualStudioWorkload.wix.cs +diff --git a/src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateWorkloadMsis.cs b/src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateWorkloadMsis.wix.cs +similarity index 100% +rename from src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateWorkloadMsis.cs +rename to src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateWorkloadMsis.wix.cs +diff --git a/src/Microsoft.DotNet.Build.Tasks.Workloads/src/Microsoft.DotNet.Build.Tasks.Workloads.csproj b/src/Microsoft.DotNet.Build.Tasks.Workloads/src/Microsoft.DotNet.Build.Tasks.Workloads.csproj +index 19cf67b5..2d02b7f4 100644 +--- a/src/Microsoft.DotNet.Build.Tasks.Workloads/src/Microsoft.DotNet.Build.Tasks.Workloads.csproj ++++ b/src/Microsoft.DotNet.Build.Tasks.Workloads/src/Microsoft.DotNet.Build.Tasks.Workloads.csproj +@@ -11,6 +11,16 @@ + $(NoWarn);NU5127 + false + Microsoft.DotNet.Build.Tasks.Workloads ++ ++ ++ true + + + +@@ -19,13 +29,16 @@ + + + +- + +- ++ + + + +- ++ ++ ++ ++ ++ + + + +@@ -48,6 +61,10 @@ + + + ++ ++ ++ ++ + + + +diff --git a/src/Microsoft.DotNet.Build.Tasks.Workloads/src/MsiProperties.cs b/src/Microsoft.DotNet.Build.Tasks.Workloads/src/MsiProperties.wix.cs +similarity index 100% +rename from src/Microsoft.DotNet.Build.Tasks.Workloads/src/MsiProperties.cs +rename to src/Microsoft.DotNet.Build.Tasks.Workloads/src/MsiProperties.wix.cs +diff --git a/src/Microsoft.DotNet.Build.Tasks.Workloads/src/MsiUtils.cs b/src/Microsoft.DotNet.Build.Tasks.Workloads/src/MsiUtils.wix.cs +similarity index 100% +rename from src/Microsoft.DotNet.Build.Tasks.Workloads/src/MsiUtils.cs +rename to src/Microsoft.DotNet.Build.Tasks.Workloads/src/MsiUtils.wix.cs +diff --git a/src/Microsoft.DotNet.Build.Tasks.Workloads/src/RelatedProduct.cs b/src/Microsoft.DotNet.Build.Tasks.Workloads/src/RelatedProduct.wix.cs +similarity index 100% +rename from src/Microsoft.DotNet.Build.Tasks.Workloads/src/RelatedProduct.cs +rename to src/Microsoft.DotNet.Build.Tasks.Workloads/src/RelatedProduct.wix.cs From 5cda6a56f9ece641caf055c74774711cd48cb0b3 Mon Sep 17 00:00:00 2001 From: Dan Seefeldt Date: Mon, 11 Oct 2021 17:36:10 -0500 Subject: [PATCH 133/140] Fix publish targets in vstest to eliminate prebuilts (#12294) --- ...r-win-runtime-identifier-in-source-b.patch | 40 +++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 src/SourceBuild/tarball/patches/vstest/0002-Don-t-publish-for-win-runtime-identifier-in-source-b.patch diff --git a/src/SourceBuild/tarball/patches/vstest/0002-Don-t-publish-for-win-runtime-identifier-in-source-b.patch b/src/SourceBuild/tarball/patches/vstest/0002-Don-t-publish-for-win-runtime-identifier-in-source-b.patch new file mode 100644 index 000000000..bd4c13409 --- /dev/null +++ b/src/SourceBuild/tarball/patches/vstest/0002-Don-t-publish-for-win-runtime-identifier-in-source-b.patch @@ -0,0 +1,40 @@ +From 071dfef93e5431a415bd9298f2ed8aaf9a22524f Mon Sep 17 00:00:00 2001 +From: dseefeld +Date: Mon, 11 Oct 2021 19:35:15 +0000 +Subject: [PATCH] Don't publish for win runtime identifier in source-build + +See https://github.com/microsoft/vstest/pull/3096 +--- + src/testhost.x86/testhost.x86.csproj | 2 +- + src/testhost/testhost.csproj | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/testhost.x86/testhost.x86.csproj b/src/testhost.x86/testhost.x86.csproj +index 7eb5cd15..09856522 100644 +--- a/src/testhost.x86/testhost.x86.csproj ++++ b/src/testhost.x86/testhost.x86.csproj +@@ -19,7 +19,7 @@ + app.manifest + + +- win7-x86 ++ win7-x86 + false + $(AssemblyName.Replace('.x86', '')).$(TargetFramework).x86 + +diff --git a/src/testhost/testhost.csproj b/src/testhost/testhost.csproj +index a780e4e9..ba0fd259 100644 +--- a/src/testhost/testhost.csproj ++++ b/src/testhost/testhost.csproj +@@ -16,7 +16,7 @@ + app.manifest + + +- win7-x64 ++ win7-x64 + false + $(AssemblyName).$(TargetFramework) + +-- +2.31.1 + From f56b57c3258b018a68e82aee828a945847389c8c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 11 Oct 2021 22:40:38 +0000 Subject: [PATCH 134/140] Update dependencies from https://github.com/dotnet/sdk build 20211011.24 (#12295) [release/6.0.1xx] Update dependencies from dotnet/sdk --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5e10f46d0..096efe54f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 5cbb78707edf860fb9399b0e34cc982046012b2c - + https://github.com/dotnet/sdk - 4832fc67f24146f6da5457de9c5393e1d557040f + 5a603c3f45ae39f601fda1b371c67b26f3ec678d - + https://github.com/dotnet/sdk - 4832fc67f24146f6da5457de9c5393e1d557040f + 5a603c3f45ae39f601fda1b371c67b26f3ec678d diff --git a/eng/Versions.props b/eng/Versions.props index b7815999d..4c23db875 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.100-rtm.21511.19 - 6.0.100-rtm.21511.19 + 6.0.100-rtm.21511.24 + 6.0.100-rtm.21511.24 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 474feaf7bf7fe2364221c4e88f37e2d9ce77fcec Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 11 Oct 2021 23:25:03 +0000 Subject: [PATCH 135/140] Update dependencies from https://github.com/dotnet/sdk build 20211011.27 (#12299) [release/6.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.SourceBuild.Intermediate.source-build: from 0.1.0-alpha.1.21460.1 to 0.1.0-alpha.1.21508.1 (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 096efe54f..1443e9f5f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 5cbb78707edf860fb9399b0e34cc982046012b2c - + https://github.com/dotnet/sdk - 5a603c3f45ae39f601fda1b371c67b26f3ec678d + 8d3d2f5235c81cd0d90995eda6280641ccfaad0f - + https://github.com/dotnet/sdk - 5a603c3f45ae39f601fda1b371c67b26f3ec678d + 8d3d2f5235c81cd0d90995eda6280641ccfaad0f @@ -170,9 +170,9 @@ https://github.com/dotnet/emsdk fd04453453de7a7d5581f4f129de09ad6838d89e - + https://github.com/dotnet/source-build - 3fb25b8db3bec654e37e71a5b2b7fde14444bc2f + b448fa29f5d273d8abf7354402d7b320d5cffcce diff --git a/eng/Versions.props b/eng/Versions.props index 4c23db875..e2206420d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.100-rtm.21511.24 - 6.0.100-rtm.21511.24 + 6.0.100-rtm.21511.27 + 6.0.100-rtm.21511.27 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From f6f78e7c509437fe5dbb8bb2b25b0ff44dd966db Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 11 Oct 2021 23:53:10 +0000 Subject: [PATCH 136/140] Update dependencies from https://github.com/dotnet/sdk build 20211011.28 (#12303) [release/6.0.1xx] Update dependencies from dotnet/sdk --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1443e9f5f..1f918fbaa 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 5cbb78707edf860fb9399b0e34cc982046012b2c - + https://github.com/dotnet/sdk - 8d3d2f5235c81cd0d90995eda6280641ccfaad0f + 5b5c9e0c662300e9e65168264e800b25b919418e - + https://github.com/dotnet/sdk - 8d3d2f5235c81cd0d90995eda6280641ccfaad0f + 5b5c9e0c662300e9e65168264e800b25b919418e diff --git a/eng/Versions.props b/eng/Versions.props index e2206420d..9edc76bea 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.100-rtm.21511.27 - 6.0.100-rtm.21511.27 + 6.0.100-rtm.21511.28 + 6.0.100-rtm.21511.28 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 1e7fff3c6b54a18aa5158685c000b8e8b51a87a1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 12 Oct 2021 00:33:52 +0000 Subject: [PATCH 137/140] Update dependencies from https://github.com/dotnet/sdk build 20211011.32 (#12304) [release/6.0.1xx] Update dependencies from dotnet/sdk --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1f918fbaa..34645e298 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 5cbb78707edf860fb9399b0e34cc982046012b2c - + https://github.com/dotnet/sdk - 5b5c9e0c662300e9e65168264e800b25b919418e + cc16527bba4bbf734cc1714a4e596bf582139873 - + https://github.com/dotnet/sdk - 5b5c9e0c662300e9e65168264e800b25b919418e + cc16527bba4bbf734cc1714a4e596bf582139873 diff --git a/eng/Versions.props b/eng/Versions.props index 9edc76bea..d6a31cc29 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.100-rtm.21511.28 - 6.0.100-rtm.21511.28 + 6.0.100-rtm.21511.32 + 6.0.100-rtm.21511.32 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From e89a7920c4d97109a0e17e3cec8e6bd223185396 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 12 Oct 2021 02:14:49 +0000 Subject: [PATCH 138/140] Update dependencies from https://github.com/dotnet/sdk build 20211011.35 (#12305) [release/6.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.NETCore.App.Ref: from 6.0.0-rtm.21510.5 to 6.0.0-rtm.21511.12 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.NetCore.TargetingPack.x64.6.0: from 6.0.0-rtm.21510.5 to 6.0.0-rtm.21511.12 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Runtime.win-x64: from 6.0.0-rtm.21510.5 to 6.0.0-rtm.21511.12 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Host.win-x64: from 6.0.0-rtm.21510.5 to 6.0.0-rtm.21511.12 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.DotNetHostResolver: from 6.0.0-rtm.21510.5 to 6.0.0-rtm.21511.12 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.Platforms: from 6.0.0-rtm.21510.5 to 6.0.0-rtm.21511.12 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.0-rtm.21510.5 to 6.0.0-rtm.21511.12 (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 34645e298..60278a216 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://github.com/dotnet/windowsdesktop ed76339f9430a1a98760e7b959ddb0b212f07400 - + https://github.com/dotnet/runtime - b1aedd5a54d0c54ec12afe98a41979fb053998a5 + d262c21063bbb5b385a776e4ce24f7132eb918dc - + https://github.com/dotnet/runtime - b1aedd5a54d0c54ec12afe98a41979fb053998a5 + d262c21063bbb5b385a776e4ce24f7132eb918dc - + https://github.com/dotnet/runtime - b1aedd5a54d0c54ec12afe98a41979fb053998a5 + d262c21063bbb5b385a776e4ce24f7132eb918dc - + https://github.com/dotnet/runtime - b1aedd5a54d0c54ec12afe98a41979fb053998a5 + d262c21063bbb5b385a776e4ce24f7132eb918dc - + https://github.com/dotnet/runtime - b1aedd5a54d0c54ec12afe98a41979fb053998a5 + d262c21063bbb5b385a776e4ce24f7132eb918dc - + https://github.com/dotnet/runtime - b1aedd5a54d0c54ec12afe98a41979fb053998a5 + d262c21063bbb5b385a776e4ce24f7132eb918dc @@ -48,9 +48,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - b1aedd5a54d0c54ec12afe98a41979fb053998a5 + d262c21063bbb5b385a776e4ce24f7132eb918dc https://github.com/dotnet/aspnetcore @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 5cbb78707edf860fb9399b0e34cc982046012b2c - + https://github.com/dotnet/sdk - cc16527bba4bbf734cc1714a4e596bf582139873 + 17b1a61e0f425ed11de177fd5ffc3e07299eab82 - + https://github.com/dotnet/sdk - cc16527bba4bbf734cc1714a4e596bf582139873 + 17b1a61e0f425ed11de177fd5ffc3e07299eab82 diff --git a/eng/Versions.props b/eng/Versions.props index d6a31cc29..2f0bfbbda 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,24 +56,24 @@ - 6.0.100-rtm.21511.32 - 6.0.100-rtm.21511.32 + 6.0.100-rtm.21511.35 + 6.0.100-rtm.21511.35 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 6.0.0-rtm.21510.5 + 6.0.0-rtm.21511.12 - 6.0.0-rtm.21510.5 - 6.0.0-rtm.21510.5 - 6.0.0-rtm.21510.5 - 6.0.0-rtm.21510.5 - 6.0.0-rtm.21510.5 - 6.0.0-rtm.21510.5 + 6.0.0-rtm.21511.12 + 6.0.0-rtm.21511.12 + 6.0.0-rtm.21511.12 + 6.0.0-rtm.21511.12 + 6.0.0-rtm.21511.12 + 6.0.0-rtm.21511.12 2.1.0 From fceda177c4149843531501dc8f767c20e5e78e91 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 12 Oct 2021 03:21:04 +0000 Subject: [PATCH 139/140] Update dependencies from https://github.com/dotnet/sdk build 20211011.36 (#12306) [release/6.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.AspNetCore.App.Ref: from 6.0.0-rtm.21511.4 to 6.0.0-rtm.21511.14 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 6.0.0-rtm.21511.4 to 6.0.0-rtm.21511.14 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.0-rtm.21511.4 to 6.0.0-rtm.21511.14 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0: from 6.0.0-rtm.21511.4 to 6.0.0-rtm.21511.14 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 6.0.0-rtm.21511.4 to 6.0.0-rtm.21511.14 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 6.0.0-rtm.21511.4 to 6.0.0-rtm.21511.14 (parent: Microsoft.NET.Sdk) --- 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 60278a216..c3aebc0e7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -52,30 +52,30 @@ https://github.com/dotnet/runtime d262c21063bbb5b385a776e4ce24f7132eb918dc - + https://github.com/dotnet/aspnetcore - 27825be06970a665d6390b320fd933a62aa6d518 + ef2d247063e952e74ca60e700eebc9f80407b1ca - + https://github.com/dotnet/aspnetcore - 27825be06970a665d6390b320fd933a62aa6d518 + ef2d247063e952e74ca60e700eebc9f80407b1ca - + https://github.com/dotnet/aspnetcore - 27825be06970a665d6390b320fd933a62aa6d518 + ef2d247063e952e74ca60e700eebc9f80407b1ca - + https://github.com/dotnet/aspnetcore - 27825be06970a665d6390b320fd933a62aa6d518 + ef2d247063e952e74ca60e700eebc9f80407b1ca - + https://github.com/dotnet/aspnetcore - 27825be06970a665d6390b320fd933a62aa6d518 + ef2d247063e952e74ca60e700eebc9f80407b1ca - + https://github.com/dotnet/aspnetcore - 27825be06970a665d6390b320fd933a62aa6d518 + ef2d247063e952e74ca60e700eebc9f80407b1ca https://github.com/dotnet/test-templates @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 5cbb78707edf860fb9399b0e34cc982046012b2c - + https://github.com/dotnet/sdk - 17b1a61e0f425ed11de177fd5ffc3e07299eab82 + e0d7b0711c319f9aec87741f05f1d922eb836833 - + https://github.com/dotnet/sdk - 17b1a61e0f425ed11de177fd5ffc3e07299eab82 + e0d7b0711c319f9aec87741f05f1d922eb836833 diff --git a/eng/Versions.props b/eng/Versions.props index 2f0bfbbda..f2c476dc9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,20 +44,20 @@ - 6.0.0-rtm.21511.4 - 6.0.0-rtm.21511.4 - 6.0.0-rtm.21511.4 - 6.0.0-rtm.21511.4 - 6.0.0-rtm.21511.4 - 6.0.0-rtm.21511.4 + 6.0.0-rtm.21511.14 + 6.0.0-rtm.21511.14 + 6.0.0-rtm.21511.14 + 6.0.0-rtm.21511.14 + 6.0.0-rtm.21511.14 + 6.0.0-rtm.21511.14 0.2.0 - 6.0.100-rtm.21511.35 - 6.0.100-rtm.21511.35 + 6.0.100-rtm.21511.36 + 6.0.100-rtm.21511.36 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From b577de504759dc27dbe46eb4bc3458a63bfd4b7e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 12 Oct 2021 06:18:55 +0000 Subject: [PATCH 140/140] Update dependencies from https://github.com/dotnet/sdk build 20211011.42 (#12307) [release/6.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.WindowsDesktop.App.Ref: from 6.0.0-rtm.21511.2 to 6.0.0-rtm.21511.12 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0: from 6.0.0-rtm.21511.2 to 6.0.0-rtm.21511.12 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0: from 6.0.0-rtm.21511.2 to 6.0.0-rtm.21511.12 (parent: Microsoft.NET.Sdk) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.0-rtm.21511.2 to 6.0.0-rtm.21511.12 (parent: Microsoft.NET.Sdk) - Microsoft.Dotnet.WinForms.ProjectTemplates: from 6.0.0-rtm.21511.2 to 6.0.0-rtm.21511.11 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.0-rtm.21511.2 to 6.0.0-rtm.21511.12 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Wpf.ProjectTemplates: from 6.0.0-rtm.21511.3 to 6.0.0-rtm.21511.15 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) --- 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 c3aebc0e7..e370e8620 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,21 +1,21 @@ - + https://github.com/dotnet/windowsdesktop - ed76339f9430a1a98760e7b959ddb0b212f07400 + 309f9f77cf759bc8d68103bc0efc76b180810a45 - + https://github.com/dotnet/windowsdesktop - ed76339f9430a1a98760e7b959ddb0b212f07400 + 309f9f77cf759bc8d68103bc0efc76b180810a45 - + https://github.com/dotnet/windowsdesktop - ed76339f9430a1a98760e7b959ddb0b212f07400 + 309f9f77cf759bc8d68103bc0efc76b180810a45 - + https://github.com/dotnet/windowsdesktop - ed76339f9430a1a98760e7b959ddb0b212f07400 + 309f9f77cf759bc8d68103bc0efc76b180810a45 https://github.com/dotnet/runtime @@ -103,23 +103,23 @@ https://github.com/dotnet/templating 5cbb78707edf860fb9399b0e34cc982046012b2c - + https://github.com/dotnet/sdk - e0d7b0711c319f9aec87741f05f1d922eb836833 + e6d7bc2f7a16a404cad81492b61339381aa76e59 - + https://github.com/dotnet/sdk - e0d7b0711c319f9aec87741f05f1d922eb836833 + e6d7bc2f7a16a404cad81492b61339381aa76e59 - + https://github.com/dotnet/winforms - ad1df8fd7c09ebabe3f6c6c41fad82cff43a3b50 + 5388194e562bf0d5c6f3eaca2af88b017f843e1c - + https://github.com/dotnet/wpf - 4455ff4633d4cd2a4ae99f76b1c24fe305aef4c5 + 81853027e2841e3d3c6e30ef4b7071e5f487d914 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index f2c476dc9..9e9ae81a5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.0-rtm.21511.2 + 6.0.0-rtm.21511.11 - 6.0.0-rtm.21511.3 + 6.0.0-rtm.21511.15 @@ -56,8 +56,8 @@ - 6.0.100-rtm.21511.36 - 6.0.100-rtm.21511.36 + 6.0.100-rtm.21511.42 + 6.0.100-rtm.21511.42 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,10 +78,10 @@ - 6.0.0-rtm.21511.2 - 6.0.0-rtm.21511.2 - 6.0.0-rtm.21511.2 - 6.0.0-rtm.21511.2 + 6.0.0-rtm.21511.12 + 6.0.0-rtm.21511.12 + 6.0.0-rtm.21511.12 + 6.0.0-rtm.21511.12