* Update dependencies from https://github.com/dotnet/sdk build 20211020.26
Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
From Version 6.0.100-rtm.21520.1 -> To Version 6.0.100-rtm.21520.26
Dependency coherency updates
Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.6.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0,dotnet-dev-certs,dotnet-user-secrets,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,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.NET.Workload.Emscripten.Manifest-6.0.100
From Version 6.0.0 -> To Version 6.0.0 (parent: Microsoft.NET.Sdk
* Resolve source-build patch conflicts
* Update dependencies from https://github.com/dotnet/sdk build 20211020.31
Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
From Version 6.0.100-rtm.21520.1 -> To Version 6.0.100-rtm.21520.31
Dependency coherency updates
Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.6.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0,dotnet-dev-certs,dotnet-user-secrets,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,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.NET.Workload.Emscripten.Manifest-6.0.100
From Version 6.0.0 -> To Version 6.0.0 (parent: Microsoft.NET.Sdk
* Update dependencies from https://github.com/dotnet/sdk build 20211021.1
Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
From Version 6.0.100-rtm.21520.1 -> To Version 6.0.100-rtm.21521.1
* Update dependencies from https://github.com/dotnet/sdk build 20211021.2
Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
From Version 6.0.100-rtm.21521.1 -> To Version 6.0.100-rtm.21521.2
* Dependency coherency updates
Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.6.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0,dotnet-dev-certs,dotnet-user-secrets,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,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.NET.Workload.Emscripten.Manifest-6.0.100
From Version 6.0.0 -> To Version 6.0.0 (parent: Microsoft.NET.Sdk
* Update dependencies from https://github.com/dotnet/sdk build 20211021.3
Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
From Version 6.0.100-rtm.21520.1 -> To Version 6.0.100-rtm.21521.3
Dependency coherency updates
Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.6.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0,dotnet-dev-certs,dotnet-user-secrets,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,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.NET.Workload.Emscripten.Manifest-6.0.100
From Version 6.0.0 -> To Version 6.0.0 (parent: Microsoft.NET.Sdk
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Michael Simons <msimons@microsoft.com>
[release/6.0.1xx] Update dependencies from dotnet/sdk
- Coherency Updates:
- Microsoft.WindowsDesktop.App.Ref: from 6.0.0 to 6.0.0 (parent: Microsoft.NET.Sdk)
- VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0: from 6.0.0-rtm.21518.16 to 6.0.0-rtm.21519.11 (parent: Microsoft.NET.Sdk)
- VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0: from 6.0.0-rtm.21518.16 to 6.0.0-rtm.21519.11 (parent: Microsoft.NET.Sdk)
- Microsoft.AspNetCore.App.Ref: from 6.0.0-rtm.21518.20 to 6.0.0-rtm.21519.6 (parent: Microsoft.NET.Sdk)
- Microsoft.AspNetCore.App.Ref.Internal: from 6.0.0-rtm.21518.20 to 6.0.0-rtm.21519.6 (parent: Microsoft.NET.Sdk)
- Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.0-rtm.21518.20 to 6.0.0-rtm.21519.6 (parent: Microsoft.NET.Sdk)
- VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0: from 6.0.0-rtm.21518.20 to 6.0.0-rtm.21519.6 (parent: Microsoft.NET.Sdk)
- dotnet-dev-certs: from 6.0.0-rtm.21518.20 to 6.0.0-rtm.21519.6 (parent: Microsoft.NET.Sdk)
- dotnet-user-secrets: from 6.0.0-rtm.21518.20 to 6.0.0-rtm.21519.6 (parent: Microsoft.NET.Sdk)
- Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.0 to 6.0.0 (parent: Microsoft.NET.Sdk)
- Microsoft.Dotnet.WinForms.ProjectTemplates: from 6.0.0-rtm.21518.9 to 6.0.0-rtm.21519.4 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
- Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.0 to 6.0.0 (parent: Microsoft.NET.Sdk)
- Microsoft.DotNet.Wpf.ProjectTemplates: from 6.0.0-rtm.21518.14 to 6.0.0-rtm.21519.8 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
- Microsoft.FSharp.Compiler: from 12.0.0-beta.21518.8 to 12.0.0-beta.21519.2 (parent: Microsoft.NET.Sdk)
- Microsoft.SourceBuild.Intermediate.fsharp: from 6.0.1-beta.21518.8 to 6.0.1-beta.21519.2 (parent: Microsoft.NET.Sdk)
- Microsoft.NET.ILLink.Tasks: from 6.0.100-1.21473.1 to 6.0.100-1.21519.4 (parent: Microsoft.NET.Sdk)
- Microsoft.Net.Compilers.Toolset: from 4.0.0-6.21515.3 to 4.0.0-6.21519.19 (parent: Microsoft.NET.Sdk)
- Microsoft.SourceBuild.Intermediate.source-build: from 0.1.0-alpha.1.21515.2 to 0.1.0-alpha.1.21519.2 (parent: Microsoft.NET.Sdk)
- Revert removed feed
- Merge branch 'release/6.0.1xx' of https://github.com/dotnet/installer into darc-release/6.0.1xx-c4f44800-5848-4386-a894-0ae69ed74d6b
- Resolve source-build patches
- Merge branch 'darc-release/6.0.1xx-c4f44800-5848-4386-a894-0ae69ed74d6b' of https://github.com/dotnet/installer into darc-release/6.0.1xx-c4f44800-5848-4386-a894-0ae69ed74d6b
- Merge branch 'release/6.0.1xx' of https://github.com/dotnet/installer into darc-release/6.0.1xx-c4f44800-5848-4386-a894-0ae69ed74d6b
- Resolve source-build patch conflicts
* Update dependencies from https://github.com/dotnet/arcade build 20211019.3
Microsoft.DotNet.CMake.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Arcade.Sdk
From Version 6.0.0-beta.21515.3 -> To Version 6.0.0-beta.21519.3
* Resolve source-build patch conflicts
* Restore the windowsdesktop feed
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Michael Simons <msimons@microsoft.com>
Co-authored-by: Jason Zhai <v-wuzhai@microsoft.com>
This is taking the approach used in previous versions of source-build: update the dependency versions of Microsoft.CodeAnalysis to the version currently being built by source-build. This is a short-term solution to get unblocked in the 6.0.0 timeframe. In the future, the previous Microsoft.CodeAnalysis versions will be available in SBRP.
Contributes to https://github.com/dotnet/source-build/issues/2420
Contributes to https://github.com/dotnet/source-build/issues/2527
[release/6.0.1xx] Update dependencies from dotnet/sdk
- Coherency Updates:
- Microsoft.NETCore.App.Ref: from 6.0.0-rtm.21512.8 to 6.0.0-rtm.21513.8 (parent: Microsoft.NET.Sdk)
- VS.Redist.Common.NetCore.TargetingPack.x64.6.0: from 6.0.0-rtm.21512.8 to 6.0.0-rtm.21513.8 (parent: Microsoft.NET.Sdk)
- Microsoft.NETCore.App.Runtime.win-x64: from 6.0.0-rtm.21512.8 to 6.0.0-rtm.21513.8 (parent: Microsoft.NET.Sdk)
- Microsoft.NETCore.App.Host.win-x64: from 6.0.0-rtm.21512.8 to 6.0.0-rtm.21513.8 (parent: Microsoft.NET.Sdk)
- Microsoft.NETCore.DotNetHostResolver: from 6.0.0-rtm.21512.8 to 6.0.0-rtm.21513.8 (parent: Microsoft.NET.Sdk)
- Microsoft.NETCore.Platforms: from 6.0.0-rtm.21512.8 to 6.0.0-rtm.21513.8 (parent: Microsoft.NET.Sdk)
- Microsoft.AspNetCore.App.Ref: from 6.0.0-rtm.21512.5 to 6.0.0-rtm.21513.9 (parent: Microsoft.NET.Sdk)
- Microsoft.AspNetCore.App.Ref.Internal: from 6.0.0-rtm.21512.5 to 6.0.0-rtm.21513.9 (parent: Microsoft.NET.Sdk)
- Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.0-rtm.21512.5 to 6.0.0-rtm.21513.9 (parent: Microsoft.NET.Sdk)
- VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0: from 6.0.0-rtm.21512.5 to 6.0.0-rtm.21513.9 (parent: Microsoft.NET.Sdk)
- dotnet-dev-certs: from 6.0.0-rtm.21512.5 to 6.0.0-rtm.21513.9 (parent: Microsoft.NET.Sdk)
- dotnet-user-secrets: from 6.0.0-rtm.21512.5 to 6.0.0-rtm.21513.9 (parent: Microsoft.NET.Sdk)
- VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.0-rtm.21512.8 to 6.0.0-rtm.21513.8 (parent: Microsoft.NET.Sdk)
- Microsoft.NET.Workload.Emscripten.Manifest-6.0.100: from 6.0.0-rtm.21505.3 to 6.0.0-rtm.21512.1 (parent: VS.Redist.Common.NetCore.SharedFramework.x64.6.0)
- Resolve source-build patch conflicts
* Move Omnisharp fix to the correct place.
We had some crossed PRs and this got added while the other patches were being moved. This moves it to the correct place.
* Update patch to apply to new hash.
* Another project dependency.
[release/6.0.1xx] Update dependencies from dotnet/sdk
- Coherency Updates:
- Microsoft.WindowsDesktop.App.Ref: from 6.0.0-rtm.21512.3 to 6.0.0-rtm.21512.5 (parent: Microsoft.NET.Sdk)
- VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0: from 6.0.0-rtm.21512.3 to 6.0.0-rtm.21512.5 (parent: Microsoft.NET.Sdk)
- VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0: from 6.0.0-rtm.21512.3 to 6.0.0-rtm.21512.5 (parent: Microsoft.NET.Sdk)
- Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.0-rtm.21512.3 to 6.0.0-rtm.21512.5 (parent: Microsoft.NET.Sdk)
- Microsoft.Dotnet.WinForms.ProjectTemplates: from 6.0.0-rtm.21512.3 to 6.0.0-rtm.21512.5 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
- Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.0-rtm.21512.3 to 6.0.0-rtm.21512.5 (parent: Microsoft.NET.Sdk)
- Microsoft.DotNet.Wpf.ProjectTemplates: from 6.0.0-rtm.21512.2 to 6.0.0-rtm.21512.4 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
- Resolve source-build patch conflicts
[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
[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
[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
* 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
* 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 <msimons@microsoft.com>
After https://github.com/dotnet/installer/pull/11843, post build signing started failing, failing to find one of the input wixobj files. The wixobj was not included in the wixpack. This is because the installer repo uses custom scripts to generate MSIs, rather than the arcade tasks (which would handle adding this transparently), so the input files need to be added explicitly.
* add text-only packages to tarball
* add BuildTextOnlyPackages target to tarball build targets
* fix typo
* add content to text only package nuspec files
* Change reference to single nuspec file
* Update based on PR review
* prevent inner buildlog from being overwritten
* condition SourceBuildIntermediate.proj copy and build on the file not existing
* condition entire copy target on SourceBuildIntermediateProjTarget file existing
* Revert "condition entire copy target on SourceBuildIntermediateProjTarget file existing"
This reverts commit 995e106c81751b7d9597abf0c120963c2ab5374b.
* Revert "condition SourceBuildIntermediate.proj copy and build on the file not existing"
This reverts commit 3fbaa11bdb34cf9bb8f006f4c27bbd16783cac09.
* Revert "prevent inner buildlog from being overwritten"
This reverts commit f994e885fd7e0938dcc80150f3a0a8aad215f014.
Co-authored-by: dseefeld <dseefeld@microsoft.com>
* [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 <msimons@microsoft.com>
Co-authored-by: Logan Bussell <36081148+lbussell@users.noreply.github.com>
* Tweaks for RTM stable building and servicing
- When building from source offline in a stable configuration, the shared frameworks versions will match the directory from which the runtime archives are located in, both stable. This is in contrast to when not building from source, in which the runtime archives will appear in non-stable directories.
- The targeting pack versions should not be assumed to always match the runtime framework versions, and the blob directories containing them are the same. Add new dependencies so that we can track where the targeting pack directory is over time.
- PGO archives coming from runtime are always built non-stable. This means the download location needs to be tweaks, and crossgen calls need to look for shared framework binaries in the non-stable locations.
- For source-build, the templating should move to a new non-stable dependency. This is used to determine the version of the source build intermediate package.
* Generate the full nuget version in the source build tarball job.
The source build tarball job needs the full nuget version so that it can publish the blob to the right location (`Sdk/<full version>/source-<stable version>.zip). This involves being able to call the GenerateFullNuGetVersion target and the targets it depends on.
* Copy instead of clone and remove .git/objects directories
* Add depth 1 to fetch command
* Add commit count to git-info for installer repo
* Update targets to fix dependency ordering
Some repos take a dependency on PrepareInnerSourceBuildRepoRoot,
assuming that the inner repo will be setup. The condition for copy
instead of clone caused a conflict.
Keep PrepareInnerSourceBuildRepoRoot and make it depend on
either copy or clone completing.
* Don't copy artifacts dir
* Actually don't remove artifacts directory
* Update prebuilt version
[release/6.0.1xx] Update dependencies from dotnet/sdk
- Coherency Updates:
- Microsoft.WindowsDesktop.App.Ref: from 6.0.0-rc.2.21423.1 to 6.0.0-rc.2.21427.2 (parent: Microsoft.NET.Sdk)
- VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0: from 6.0.0-rc.2.21423.1 to 6.0.0-rc.2.21427.2 (parent: Microsoft.NET.Sdk)
- Microsoft.NETCore.App.Ref: from 6.0.0-rc.2.21423.6 to 6.0.0-rc.2.21427.5 (parent: Microsoft.NET.Sdk)
- Microsoft.NETCore.App.Runtime.win-x64: from 6.0.0-rc.2.21423.6 to 6.0.0-rc.2.21427.5 (parent: Microsoft.NET.Sdk)
- Microsoft.NETCore.App.Host.win-x64: from 6.0.0-rc.2.21423.6 to 6.0.0-rc.2.21427.5 (parent: Microsoft.NET.Sdk)
- Microsoft.NETCore.DotNetHostResolver: from 6.0.0-rc.2.21423.6 to 6.0.0-rc.2.21427.5 (parent: Microsoft.NET.Sdk)
- Microsoft.NETCore.Platforms: from 6.0.0-rc.2.21423.6 to 6.0.0-rc.2.21427.5 (parent: Microsoft.NET.Sdk)
- Microsoft.AspNetCore.App.Ref: from 6.0.0-rc.2.21420.26 to 6.0.0-rc.2.21427.4 (parent: Microsoft.NET.Sdk)
- Microsoft.AspNetCore.App.Ref.Internal: from 6.0.0-rc.2.21420.26 to 6.0.0-rc.2.21427.4 (parent: Microsoft.NET.Sdk)
- Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.0-rc.2.21420.26 to 6.0.0-rc.2.21427.4 (parent: Microsoft.NET.Sdk)
- VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0: from 6.0.0-rc.2.21420.26 to 6.0.0-rc.2.21427.4 (parent: Microsoft.NET.Sdk)
- dotnet-dev-certs: from 6.0.0-rc.2.21420.26 to 6.0.0-rc.2.21427.4 (parent: Microsoft.NET.Sdk)
- dotnet-user-secrets: from 6.0.0-rc.2.21420.26 to 6.0.0-rc.2.21427.4 (parent: Microsoft.NET.Sdk)
- Microsoft.DotNet.Common.ItemTemplates: from 6.0.100-rc.2.21423.5 to 6.0.100-rc.2.21426.9 (parent: Microsoft.NET.Sdk)
- Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.0-rc.2.21423.1 to 6.0.0-rc.2.21427.2 (parent: Microsoft.NET.Sdk)
- Microsoft.Dotnet.WinForms.ProjectTemplates: from 6.0.0-rc.2.21423.3 to 6.0.0-rc.2.21427.1 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
- Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.0-rc.2.21423.1 to 6.0.0-rc.2.21427.2 (parent: Microsoft.NET.Sdk)
- Microsoft.DotNet.Wpf.ProjectTemplates: from 6.0.0-rc.2.21423.3 to 6.0.0-rc.2.21427.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
- Microsoft.FSharp.Compiler: from 12.0.0-beta.21418.3 to 12.0.0-beta.21426.5 (parent: Microsoft.NET.Sdk)
- Microsoft.SourceBuild.Intermediate.fsharp: from 5.0.3-beta.21418.3 to 5.0.3-beta.21426.5 (parent: Microsoft.NET.Sdk)
- Microsoft.Net.Compilers.Toolset: from 4.0.0-4.21420.19 to 4.0.0-4.21427.2 (parent: Microsoft.NET.Sdk)
- Microsoft.Build: from 17.0.0-preview-21423-05 to 17.0.0-preview-21427-02 (parent: Microsoft.NET.Sdk)
- VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.0-rc.2.21423.6 to 6.0.0-rc.2.21427.5 (parent: Microsoft.NET.Sdk)
- Microsoft.NET.Workload.Emscripten.Manifest-6.0.100: from 6.0.0-rc.1.21419.1 to 6.0.0-rc.2.21425.6 (parent: VS.Redist.Common.NetCore.SharedFramework.x64.6.0)
- Update stage0
- Update package name for Microsoft.DotNet.Web.ItemTemplates
React to this commit in aspnetcore that updated the package name to be suffixed with the Major.Minor of the current release: 43f52607fa
[release/6.0.1xx-rc1] Update dependencies from dotnet/sdk
- Coherency Updates:
- Microsoft.NETCore.App.Ref: from 6.0.0-rc.1.21425.15 to 6.0.0-rc.1.21426.17 (parent: Microsoft.NET.Sdk)
- Microsoft.NETCore.App.Runtime.win-x64: from 6.0.0-rc.1.21425.15 to 6.0.0-rc.1.21426.17 (parent: Microsoft.NET.Sdk)
- Microsoft.NETCore.App.Host.win-x64: from 6.0.0-rc.1.21425.15 to 6.0.0-rc.1.21426.17 (parent: Microsoft.NET.Sdk)
- Microsoft.NETCore.DotNetHostResolver: from 6.0.0-rc.1.21425.15 to 6.0.0-rc.1.21426.17 (parent: Microsoft.NET.Sdk)
- Microsoft.NETCore.Platforms: from 6.0.0-rc.1.21425.15 to 6.0.0-rc.1.21426.17 (parent: Microsoft.NET.Sdk)
- Microsoft.AspNetCore.App.Ref: from 6.0.0-rc.1.21425.34 to 6.0.0-rc.1.21426.34 (parent: Microsoft.NET.Sdk)
- Microsoft.AspNetCore.App.Ref.Internal: from 6.0.0-rc.1.21425.34 to 6.0.0-rc.1.21426.34 (parent: Microsoft.NET.Sdk)
- Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.0-rc.1.21425.34 to 6.0.0-rc.1.21426.34 (parent: Microsoft.NET.Sdk)
- VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0: from 6.0.0-rc.1.21425.34 to 6.0.0-rc.1.21426.34 (parent: Microsoft.NET.Sdk)
- dotnet-dev-certs: from 6.0.0-rc.1.21425.34 to 6.0.0-rc.1.21426.34 (parent: Microsoft.NET.Sdk)
- dotnet-user-secrets: from 6.0.0-rc.1.21425.34 to 6.0.0-rc.1.21426.34 (parent: Microsoft.NET.Sdk)
- Microsoft.DotNet.Common.ItemTemplates: from 6.0.100-rc.1.21426.4 to 6.0.100-rc.1.21426.10 (parent: Microsoft.NET.Sdk)
- Microsoft.FSharp.Compiler: from 12.0.0-beta.21426.1 to 12.0.0-beta.21426.5 (parent: Microsoft.NET.Sdk)
- Microsoft.SourceBuild.Intermediate.fsharp: from 5.0.3-beta.21426.1 to 5.0.3-beta.21426.5 (parent: Microsoft.NET.Sdk)
- Microsoft.Net.Compilers.Toolset: from 4.0.0-4.21426.10 to 4.0.0-4.21426.21 (parent: Microsoft.NET.Sdk)
- VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.0-rc.1.21425.15 to 6.0.0-rc.1.21426.17 (parent: Microsoft.NET.Sdk)
- Update package name for Microsoft.DotNet.Web.ItemTemplates
React to this commit in aspnetcore that updated the package name to be suffixed with the Major.Minor of the current release: 43f52607fa