mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions
24624 commits 41 branches 190 tags 95 MiB
Commit graph

4691 commits

Author SHA1 Message Date
martin-costello
a3e8652e50 Extend productCommit-rid.txt 
Extend the changes from #13132 to include the versions of the ASP.NET Core shared runtime, Windows Desktop and the .NET SDK itself.
 2022-04-21 16:13:56 +01:00
Jason Zhai
e3ae2d8e68 Merge branch 'release/6.0.4xx' into main 2022-04-20 23:19:28 -07:00
dotnet-bot
d3916de4f7 Merge in 'release/6.0.3xx' changes 2022-04-21 03:07:58 +00:00
v-wuzhai
20e198c744
Merge pull request #13673 from dotnet-maestro-bot/merge/release/6.0.2xx-to-release/6.0.3xx 
[automated] Merge branch 'release/6.0.2xx' => 'release/6.0.3xx'
 2022-04-20 19:57:12 -07:00
Marc Paine
8be158f06d Add the major minor version to two of our transport packages to enable SxS installs in previews 2022-04-20 16:51:31 -07:00
DotNet Bot
91c6682f9e Merged PR 22483: [internal/release/6.0.3xx] Update dependencies from dnceng/internal/dotnet-sdk 
This pull request updates the following dependencies

[marker]: <> (Begin:Coherency Updates)
## Coherency Updates

The following updates ensure that dependencies with a *CoherentParentDependency*
attribute were produced in a build used as input to the parent dependency's build.
See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview)

[DependencyUpdate]: <> (Begin)

- **Coherency Updates**:
  - **Microsoft.WindowsDesktop.App.Ref**: from 6.0.4 to 6.0.5 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.4-servicing.22165.2 to 6.0.5-servicing.22215.11 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.4-servicing.22165.2 to 6.0.5-servicing.22215.11 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.4-servicing.22164.4 to 6.0.5-servicing.22213.9 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Ref**: from 6.0.4 to 6.0.5 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.4-servicing.22164.4 to 6.0.5-servicing.22213.9 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.4 to 6.0.5 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.4 to 6.0.5 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.4 to 6.0.5 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref**: from 6.0.4 to 6.0.5 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.4-servicing.22172.4 to 6.0.5-servicing.22218.2 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.4 to 6.0.5 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.4-servicing.22172.4 to 6.0.5-servicing.22218.2 (parent: Microsoft.NET.Sdk)
  - **dotnet-dev-certs**: from 6.0.4-servicing.22172.4 to 6.0.5-servicing.22218.2 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-secrets**: from 6.0.4-servicing.22172.4 to 6.0.5-servicing.22218.2 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.300-preview.22208.4 to 6.0.300 (parent: Microsoft.NET.Sdk)
  - **Microsoft.TemplateEngine.Cli**: from 6.0.300-preview.22208.4 to 6.0.300-rtm.22215.5 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.300-preview.22208.4 to 6.0.300 (parent: Microsoft.NET.Sdk)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.4 to 6.0.5 (parent: Microsoft.NET.Sdk)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.4 to 6.0.5 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.4-servicing.22165.3 to 6.0.5-servicing.22215.9 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - **Microsoft.FSharp.Compiler**: fr...
 2022-04-20 23:43:56 +00:00
Michael Simons
73d8fb56fa
Enable deployment-tools, msbuild, and vstest repos in source-build (#13677) 2022-04-20 15:40:57 -05:00
Michael Simons
f312ae0fe8
Enable linker and package-source-build in source-build (#13669) 2022-04-20 11:59:01 -05:00
v-wuzhai
bd888b3457
Merge pull request #13661 from dotnet-maestro-bot/merge/release/6.0.1xx-to-release/6.0.2xx 
[automated] Merge branch 'release/6.0.1xx' => 'release/6.0.2xx'
 2022-04-19 19:36:57 -07:00
v-wuzhai
69fe928672
Merge pull request #13655 from dotnet-maestro-bot/merge/release/6.0.2xx-to-release/6.0.3xx 
[automated] Merge branch 'release/6.0.2xx' => 'release/6.0.3xx'
 2022-04-19 19:36:48 -07:00
Michael Simons
2a412d3454
Remove CheckSourceBuiltNupkgConflictUsages target (#13668) 2022-04-19 17:23:25 -05:00
Michael Simons
038c811c97
Enable all tier 1 repos in source-build (#13658) 2022-04-19 17:19:00 -05:00
Michael Simons
65dd7c1427
Remove net TFMs from xml doc baseline (#13662) 2022-04-19 22:00:36 +00:00
Michael Simons
35803a779f
Update source-build projects to net7.0 (#13663) 2022-04-19 16:50:46 -05:00
Logan Bussell
4acd960d76
[main] Build arcade and sourcelink in source-build tarball (#13657) 
* build arcade and sourcelink in source-build tarball

* update arcade target framework override to reflect change in arcade package output

Co-authored-by: Michael Simons <msimons@microsoft.com>
 2022-04-19 18:47:29 +00:00
Bo Anderson
e44e5907d6
Fix compatibility with BSD df (#13653) 2022-04-19 08:44:59 -05:00
v-wuzhai
789db9e502
Merge pull request #13649 from dotnet/darc-main-158162d1-d711-4622-b087-ce4608ffb6de 
[main] Update dependencies from dotnet/sdk
 2022-04-18 18:36:31 -07:00
Logan Bussell
ca04284533
[main] Re-enable Source Build Tarball Build CI and disable all repo builds (#13605) 
* re-enable tarball build in C

* remove all projects except SBRP from known-good

* disable smoke tests until more repos are building

Co-authored-by: Michael Simons <msimons@microsoft.com>
 2022-04-18 10:44:38 -07:00
Daniel Plaisted
d46c9533f7
Merge pull request #13632 from dotnet-maestro-bot/merge/release/6.0.1xx-to-release/6.0.2xx 
[automated] Merge branch 'release/6.0.1xx' => 'release/6.0.2xx'
 2022-04-18 06:57:07 -07:00
MichaelSimons
c799829d17 Remove source-build patch that was backported 2022-04-18 13:43:41 +00:00
Michael Simons
21c7bb3abb
Fix threading issue in ExecuteHelper (#13643) 2022-04-15 15:24:48 -05:00
Jason Zhai
28b49f8e2d Merge branch 'release/6.0.4xx' into main 2022-04-14 23:36:46 -07:00
Michael Simons
5609d7db88
Exclude sdk content tests in PR validation and public CI (#13644) 2022-04-14 20:19:51 -05:00
Michael Simons
1f059f340c
[source-build] Expose CleanWhileBuilding msbuild option in build.sh (#13642) 2022-04-15 00:14:43 +00:00
Marc Paine
04e40fa940
Merge pull request #13629 from dotnet/marcpopMSFT-60300manifests 
Update all workloads to the April release of 6.0.300 manifests
 2022-04-14 14:20:25 -07:00
Michael Simons
3da46c012c
Add retry to omnisharp download (#13639) 2022-04-14 21:20:25 +00:00
Marc Paine
8ed3ae9f13
Fix the source build leg for the 300 workloads 2022-04-14 13:17:10 -07:00
Michael Simons
ec6f14da69
Update MsftToSbSdk baseline in response to SBRP text-only package fix (#13628) 2022-04-14 12:48:49 -05:00
dotnet-maestro-bot
d419470991
Add patch for linker prebuilt (#13630) (#13633) 
Co-authored-by: Michael Simons <msimons@microsoft.com>
 2022-04-14 03:27:25 +00:00
Michael Simons
9104a1f6e4
Add patch for linker prebuilt (#13630) 2022-04-13 21:49:19 -05:00
Logan Bussell
9563e594c5
[release/6.0.1xx] Retry source-build artifacts download on failure (#13591) 
* retry source-built artifacts download with curl
 2022-04-13 17:43:13 -07:00
Marc Paine
3ddadcc14f
Update all workloads to the April release of 6.0.300 manifests 2022-04-13 13:33:27 -07:00
Matt Mitchell
14330ee057
Merge branch 'release/6.0.3xx' into merge/release/6.0.2xx-to-release/6.0.3xx 2022-04-13 09:37:28 -07:00
Marc Paine
f17fb6728c
Final branding for 6.0.300 (#13608) 2022-04-13 08:02:27 -07:00
Matt Mitchell
40f5222a0d
Merge pull request #13602 from vseanreesermsft/internal-merge-6.0.1xx-2022-04-12-1157 
Merging internal commits for release/6.0.1xx
 2022-04-13 07:47:09 -07:00
v-wuzhai
314db6c4f5
Merge pull request #13587 from dotnet-maestro-bot/merge/release/6.0.3xx-to-main 
[automated] Merge branch 'release/6.0.3xx' => 'main'
 2022-04-12 17:55:02 -07:00
NET Source-Build Bot
8d32713c4e
update global.json and Versions.props for .NET SDK 6.0.104 (#13607) 2022-04-13 00:36:01 +00:00
William Godbe
6bfbfe26a7
Update asp.net templates/downlevel runtimes (#13546) 
* Update asp.net templates/downlevel runtimes

* Update GenerateBundledVersions.targets
 2022-04-12 20:39:29 +00:00
Sean Reeser
72e5a349ae Merge commit '915d644e451858f4f7c6e1416ea202695ddd54fb' into internal-merge-6.0.1xx-2022-04-12-1157 2022-04-12 11:57:14 -07:00
Sean Reeser
8e7442b2d8 Merge commit 'f8a55617d250f5db711e7425428671da5f1967a3' into internal-merge-6.0.2xx-2022-04-12-1157 2022-04-12 11:57:07 -07:00
MichaelSimons
c3accde0dc Remove aspnetcore source-build patch that was already backported 2022-04-12 14:24:18 +00:00
Jason Zhai
3087490b26 Merge branch 'release/6.0.3xx' into main 2022-04-11 19:46:23 -07:00
Jason Zhai
3d646a39f9 Merge branch 'release/6.0.2xx' into release/6.0.3xx 2022-04-10 21:23:03 -07:00
MichaelSimons
2f7d7bbfeb Resolve source-build patch conflict 2022-04-08 18:29:50 +00:00
Jason Zhai
316d39733a Merge branch 'release/6.0.1xx' into release/6.0.2xx 2022-04-07 19:50:15 -07:00
Michael Simons
ad01a74f43
Add arm64 leg to CI (#13500) 2022-04-07 11:34:26 -05:00
Michael Simons
49444f300c
Build aspnetcore project templates in source-build (#13459) 2022-04-07 08:12:37 -05:00
MichaelSimons
d277a44e4c Removed backported vstest source-build patch 2022-04-06 21:52:48 +00:00
Jason Zhai
0a94cacbf6 Merge branch 'release/6.0.3xx' into main 2022-04-06 00:40:27 -07:00
dotnet-maestro[bot]
e779f0adeb
[main] Update dependencies from dotnet/sdk (#13524) 
* Update dependencies from https://github.com/dotnet/sdk build 20220401.3

Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 7.0.100-preview.4.22201.1 -> To Version 7.0.100-preview.4.22201.3

Dependency coherency updates

Microsoft.NET.Test.Sdk
 From Version 17.2.0-preview-20220308-05 -> To Version 17.2.0-preview-20220401-07 (parent: Microsoft.NET.Sdk

* Update dependencies from https://github.com/dotnet/sdk build 20220401.5

Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 7.0.100-preview.4.22201.1 -> To Version 7.0.100-preview.4.22201.5

Dependency coherency updates

Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.NET.Test.Sdk,VS.Redist.Common.NetCore.SharedFramework.x64.7.0
 From Version 7.0.0-preview.4.22180.7 -> To Version 7.0.0-preview.4.22201.1 (parent: Microsoft.NET.Sdk

* Update dependencies from https://github.com/dotnet/sdk build 20220401.7

Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 7.0.100-preview.4.22201.1 -> To Version 7.0.100-preview.4.22201.7

Dependency coherency updates

Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-secrets,Microsoft.NET.Test.Sdk,VS.Redist.Common.NetCore.SharedFramework.x64.7.0
 From Version 7.0.0-preview.4.22180.7 -> To Version 7.0.0-preview.4.22201.1 (parent: Microsoft.NET.Sdk

* Update dependencies from https://github.com/dotnet/sdk build 20220401.8

Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 7.0.100-preview.4.22201.1 -> To Version 7.0.100-preview.4.22201.8

Dependency coherency updates

Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-secrets,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,NuGet.Build.Tasks,VS.Redist.Common.NetCore.SharedFramework.x64.7.0
 From Version 7.0.0-preview.4.22180.7 -> To Version 7.0.0-preview.4.22201.1 (parent: Microsoft.NET.Sdk

* Update dependencies from https://github.com/dotnet/sdk build 20220401.11

Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 7.0.100-preview.4.22201.1 -> To Version 7.0.100-preview.4.22201.11

Dependency coherency updates

Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-secrets,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,NuGet.Build.Tasks,VS.Redist.Common.NetCore.SharedFramework.x64.7.0
 From Version 7.0.0-preview.4.22180.5 -> To Version 7.0.0-preview.4.22181.1 (parent: Microsoft.NET.Sdk

* Update dependencies from https://github.com/dotnet/sdk build 20220402.1

Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 7.0.100-preview.4.22201.1 -> To Version 7.0.100-preview.4.22202.1

Dependency coherency updates

Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-secrets,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,NuGet.Build.Tasks,VS.Redist.Common.NetCore.SharedFramework.x64.7.0
 From Version 7.0.0-preview.4.22180.5 -> To Version 7.0.0-preview.4.22181.1 (parent: Microsoft.NET.Sdk

* Update dependencies from https://github.com/dotnet/sdk build 20220402.2

Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 7.0.100-preview.4.22201.1 -> To Version 7.0.100-preview.4.22202.2

Dependency coherency updates

Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-secrets,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,NuGet.Build.Tasks,VS.Redist.Common.NetCore.SharedFramework.x64.7.0
 From Version 7.0.0-preview.4.22180.5 -> To Version 7.0.0-preview.4.22181.1 (parent: Microsoft.NET.Sdk

* Update dependencies from https://github.com/dotnet/sdk build 20220402.3

Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 7.0.100-preview.4.22201.1 -> To Version 7.0.100-preview.4.22202.3

Dependency coherency updates

Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-secrets,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,NuGet.Build.Tasks,VS.Redist.Common.NetCore.SharedFramework.x64.7.0
 From Version 7.0.0-preview.4.22180.5 -> To Version 7.0.0-preview.4.22181.1 (parent: Microsoft.NET.Sdk

* Update dependencies from https://github.com/dotnet/sdk build 20220404.1

Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 7.0.100-preview.4.22201.1 -> To Version 7.0.100-preview.4.22204.1

Dependency coherency updates

Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-secrets,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,NuGet.Build.Tasks,VS.Redist.Common.NetCore.SharedFramework.x64.7.0
 From Version 7.0.0-preview.4.22180.5 -> To Version 7.0.0-preview.4.22181.1 (parent: Microsoft.NET.Sdk

* Remove vstest source-build patch that was backported

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: MichaelSimons <msimons@microsoft.com>
 2022-04-04 14:53:40 +00:00
Jason Zhai
e2dc4a8562 Merge branch 'release/6.0.2xx' into release/6.0.3xx 2022-04-01 19:48:09 -07:00
v-wuzhai
9d2f43f3de
Merge pull request #13513 from dotnet-maestro-bot/merge/release/6.0.1xx-to-release/6.0.2xx 
[automated] Merge branch 'release/6.0.1xx' => 'release/6.0.2xx'
 2022-04-01 00:18:17 -07:00
Chris Rummel
f6e3766b7a
Add source-build leak detection (#13434) 2022-03-31 19:12:59 -05:00
Michael Simons
011137efdc
Merge pull request #13494 from dotnet/darc-release/6.0.3xx-a94726bb-356e-4dff-8123-3b2fee1943e8 
[release/6.0.3xx] Update dependencies from dotnet/sdk
 2022-03-30 20:49:27 -05:00
MichaelSimons
5ad51d6f86 Remove source-build patches that were backported 2022-03-31 00:35:58 +00:00
Michael Simons
6411930b69
Merge pull request #13492 from dotnet/darc-main-c3d48740-9901-4ab9-89e4-ab628f78b98e 
[main] Update dependencies from dotnet/sdk
 2022-03-30 14:39:18 -05:00
MichaelSimons
9e3f77b66d Remove roslyn source-build patches that were backported 2022-03-30 18:19:27 +00:00
Michael Simons
ec8c3c5124 Remove CliCommandLineParser from source-build 2022-03-29 12:53:53 -05:00
Marc Paine
197e06982e
Update implicit version for March release 2022-03-29 10:22:40 -07:00
Marc Paine
5a16cd63d9
Merge pull request #13473 from dotnet/darc-main-f7696490-138e-4123-aaa4-a1273a9e8fb5 
[main] Update dependencies from dotnet/sdk
 2022-03-28 11:21:35 -07:00
MichaelSimons
091f8bc4e9 Remove additional NuGet.Client source-build patch that was backported 2022-03-28 16:19:26 +00:00
dotnet-maestro[bot]
75b3006c8a
[release/6.0.3xx] Update dependencies from dotnet/sdk (#13455) 
* Update dependencies from https://github.com/dotnet/sdk build 20220323.4

Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.300-preview.22172.2 -> To Version 6.0.300-preview.22173.4

Dependency coherency updates

Microsoft.Net.Compilers.Toolset,Microsoft.Build
 From Version 4.2.0-2.22171.5 -> To Version 4.2.0-2.22172.6 (parent: Microsoft.NET.Sdk

* Update dependencies from https://github.com/dotnet/sdk build 20220323.8

Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.300-preview.22172.2 -> To Version 6.0.300-preview.22173.8

Dependency coherency updates

Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset,Microsoft.Build
 From Version 12.0.3-beta.22171.1 -> To Version 12.0.3-beta.22172.6 (parent: Microsoft.NET.Sdk

* Update dependencies from https://github.com/dotnet/sdk build 20220323.10

Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.300-preview.22172.2 -> To Version 6.0.300-preview.22173.10

Dependency coherency updates

Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset,Microsoft.Build
 From Version 12.0.3-beta.22171.1 -> To Version 12.0.3-beta.22172.6 (parent: Microsoft.NET.Sdk

* Update dependencies from https://github.com/dotnet/sdk build 20220323.13

Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.300-preview.22172.2 -> To Version 6.0.300-preview.22173.13

Dependency coherency updates

Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build
 From Version 12.0.3-beta.22171.1 -> To Version 12.0.3-beta.22172.6 (parent: Microsoft.NET.Sdk

* Update dependencies from https://github.com/dotnet/sdk build 20220323.16

Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.300-preview.22172.2 -> To Version 6.0.300-preview.22173.16

Dependency coherency updates

Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build
 From Version 12.0.3-beta.22171.1 -> To Version 12.0.3-beta.22172.6 (parent: Microsoft.NET.Sdk

* Update dependencies from https://github.com/dotnet/sdk build 20220323.17

Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.300-preview.22172.2 -> To Version 6.0.300-preview.22173.17

Dependency coherency updates

Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build
 From Version 12.0.3-beta.22171.1 -> To Version 12.0.3-beta.22172.6 (parent: Microsoft.NET.Sdk

* Update dependencies from https://github.com/dotnet/sdk build 20220324.5

Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.300-preview.22172.2 -> To Version 6.0.300-preview.22174.5

Dependency coherency updates

Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build
 From Version 12.0.3-beta.22171.1 -> To Version 12.0.3-beta.22172.6 (parent: Microsoft.NET.Sdk

* Fix test for api change in sdk.

* Update dependencies from https://github.com/dotnet/sdk build 20220324.11

Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.300-preview.22172.2 -> To Version 6.0.300-preview.22174.11

Dependency coherency updates

Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build
 From Version 12.0.3-beta.22171.1 -> To Version 12.0.3-beta.22172.6 (parent: Microsoft.NET.Sdk

* Update dependencies from https://github.com/dotnet/sdk build 20220324.13

Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.300-preview.22172.2 -> To Version 6.0.300-preview.22174.13

Dependency coherency updates

Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build
 From Version 12.0.3-beta.22171.1 -> To Version 12.0.3-beta.22173.1 (parent: Microsoft.NET.Sdk

* Update dependencies from https://github.com/dotnet/sdk build 20220325.2

Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.300-preview.22172.2 -> To Version 6.0.300-preview.22175.2

Dependency coherency updates

Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build
 From Version 6.0.300-preview.22171.2 -> To Version 6.0.300-preview.22174.5 (parent: Microsoft.NET.Sdk

* Update dependencies from https://github.com/dotnet/sdk build 20220325.7

Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.300-preview.22172.2 -> To Version 6.0.300-preview.22175.7

* Update dependencies from https://github.com/dotnet/sdk build 20220325.9

Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.300-preview.22175.7 -> To Version 6.0.300-preview.22175.9

* Update dependencies from https://github.com/dotnet/sdk build 20220325.12

Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.300-preview.22175.9 -> To Version 6.0.300-preview.22175.12

* Dependency coherency updates

Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks
 From Version 6.0.300-preview.22171.2 -> To Version 6.0.300-preview.22174.5 (parent: Microsoft.NET.Sdk

* Update dependencies from https://github.com/dotnet/sdk build 20220328.3

Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.300-preview.22172.2 -> To Version 6.0.300-preview.22178.3

Dependency coherency updates

Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks
 From Version 6.0.300-preview.22171.2 -> To Version 6.0.300-preview.22174.5 (parent: Microsoft.NET.Sdk

* Remove NuGet.Client source-build patches that were backported

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Marc Paine <marcpop@microsoft.com>
Co-authored-by: MichaelSimons <msimons@microsoft.com>
 2022-03-28 09:16:59 -07:00
dotnet-maestro-bot
a2a2f48f83
[automated] Merge branch 'release/6.0.2xx' => 'release/6.0.3xx' (#13461) (#13469) 
* Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220309.1

Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 6.0.0-servicing.22158.2 -> To Version 6.0.0-servicing.22159.1

* Update source-build with 6.0.103 artifacts

* Disable public source-build tarball ci (#13377)

* Fix invalid pipeline trigger.

* Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220310.1

Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 6.0.0-servicing.22159.1 -> To Version 6.0.0-servicing.22160.1

* Update dependencies from https://github.com/dotnet/arcade build 20220309.8

Microsoft.DotNet.CMake.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Arcade.Sdk
 From Version 6.0.0-beta.22122.7 -> To Version 6.0.0-beta.22159.8

* Remove maui workloads from 6.0.100

The old workloads break MU so we either have to update them or remove them.

* Only do signcheck if there are files to sign check

* Remove template text-only packages which are alread included in source-build (#13380)

* Update dependencies from https://github.com/dotnet/arcade build 20220311.1

Microsoft.DotNet.CMake.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Arcade.Sdk
 From Version 6.0.0-beta.22159.8 -> To Version 6.0.0-beta.22161.1

* Update source-build MsftToSbSdk.diff baseline (#13400)

* Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220311.1

Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 6.0.0-servicing.22160.1 -> To Version 6.0.0-servicing.22161.1

* [release/6.0.1xx] Windows SDK projection update

* [release/6.0.1xx] dotnet watch smoke test (#13392)

* add dotnet watch smoke test

* Fix issue with BundledTemplates condition

* Make a source-build targetted fix to unblock release

* Fix issue with BundledTemplates condition

* Make a source-build targetted fix to unblock release

* Refactor build.sh to optimize PackageVersions.props retrieval (#13443)

* Update NuGet path issue in Run Tests CI step (#13453)

* Refactor SdkContentTests to warn on diffs when run in CI (#13432)

* Revert the Versions.props file

* Revert the Versions.props file

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: MichaelSimons <msimons@microsoft.com>
Co-authored-by: v-wuzhai <46013274+v-wuzhai@users.noreply.github.com>
Co-authored-by: Marc Paine <marcpop@microsoft.com>
Co-authored-by: Jason Zhai <v-wuzhai@microsoft.com>
Co-authored-by: Manodasan Wignarajah <mawign@microsoft.com>
Co-authored-by: Logan Bussell <loganbussell@microsoft.com>

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: MichaelSimons <msimons@microsoft.com>
Co-authored-by: v-wuzhai <46013274+v-wuzhai@users.noreply.github.com>
Co-authored-by: Marc Paine <marcpop@microsoft.com>
Co-authored-by: Jason Zhai <v-wuzhai@microsoft.com>
Co-authored-by: Manodasan Wignarajah <mawign@microsoft.com>
Co-authored-by: Logan Bussell <loganbussell@microsoft.com>
 2022-03-28 09:15:59 -07:00
MichaelSimons
5a4e58099a Remove NuGet.Client source-build patches that were backported 2022-03-28 14:54:03 +00:00
dotnet-maestro-bot
6791ff652b
[automated] Merge branch 'release/6.0.2xx' => 'release/6.0.3xx' (#13461) 
* Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220309.1

Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 6.0.0-servicing.22158.2 -> To Version 6.0.0-servicing.22159.1

* Update source-build with 6.0.103 artifacts

* Disable public source-build tarball ci (#13377)

* Fix invalid pipeline trigger.

* Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220310.1

Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 6.0.0-servicing.22159.1 -> To Version 6.0.0-servicing.22160.1

* Update dependencies from https://github.com/dotnet/arcade build 20220309.8

Microsoft.DotNet.CMake.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Arcade.Sdk
 From Version 6.0.0-beta.22122.7 -> To Version 6.0.0-beta.22159.8

* Remove maui workloads from 6.0.100

The old workloads break MU so we either have to update them or remove them.

* Only do signcheck if there are files to sign check

* Remove template text-only packages which are alread included in source-build (#13380)

* Update dependencies from https://github.com/dotnet/arcade build 20220311.1

Microsoft.DotNet.CMake.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Arcade.Sdk
 From Version 6.0.0-beta.22159.8 -> To Version 6.0.0-beta.22161.1

* Update source-build MsftToSbSdk.diff baseline (#13400)

* Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220311.1

Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 6.0.0-servicing.22160.1 -> To Version 6.0.0-servicing.22161.1

* [release/6.0.1xx] Windows SDK projection update

* [release/6.0.1xx] dotnet watch smoke test (#13392)

* add dotnet watch smoke test

* Fix issue with BundledTemplates condition

* Make a source-build targetted fix to unblock release

* Fix issue with BundledTemplates condition

* Make a source-build targetted fix to unblock release

* Refactor build.sh to optimize PackageVersions.props retrieval (#13443)

* Update NuGet path issue in Run Tests CI step (#13453)

* Refactor SdkContentTests to warn on diffs when run in CI (#13432)

* Revert the Versions.props file

* Revert the Versions.props file

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: MichaelSimons <msimons@microsoft.com>
Co-authored-by: v-wuzhai <46013274+v-wuzhai@users.noreply.github.com>
Co-authored-by: Marc Paine <marcpop@microsoft.com>
Co-authored-by: Jason Zhai <v-wuzhai@microsoft.com>
Co-authored-by: Manodasan Wignarajah <mawign@microsoft.com>
Co-authored-by: Logan Bussell <loganbussell@microsoft.com>
 2022-03-25 09:58:21 -07:00
Michael Simons
9a5c6656c6
Merge pull request #13457 from dotnet-maestro-bot/merge/release/6.0.1xx-to-release/6.0.2xx 
[automated] Merge branch 'release/6.0.1xx' => 'release/6.0.2xx'
 2022-03-24 08:21:42 -05:00
Marc Paine
0e5019720b
Merge pull request #13448 from dotnet/sdl 
Add SDL checks
 2022-03-23 14:37:20 -07:00
dotnet-maestro[bot]
96c8cd8592
[main] Update dependencies from dotnet/sdk (#13376) 
* Update dependencies from https://github.com/dotnet/sdk build 20220309.17

Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 7.0.100-preview.3.22159.14 -> To Version 7.0.100-preview.3.22159.17

Dependency coherency updates

Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.Manifest-7.0.100
 From Version 7.0.0-preview.3.22151.6 -> To Version 7.0.0-preview.3.22158.2 (parent: Microsoft.NET.Sdk

* Update dependencies from https://github.com/dotnet/sdk build 20220310.15

Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 7.0.100-preview.3.22159.14 -> To Version 7.0.100-preview.3.22160.15

Dependency coherency updates

Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.Manifest-7.0.100
 From Version 7.0.0-preview.3.22151.6 -> To Version 7.0.0-preview.3.22158.2 (parent: Microsoft.NET.Sdk

* Update dependencies from https://github.com/dotnet/sdk build 20220310.18

Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 7.0.100-preview.3.22159.14 -> To Version 7.0.100-preview.3.22160.18

Dependency coherency updates

Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-secrets,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.Manifest-7.0.100
 From Version 7.0.0-preview.3.22151.6 -> To Version 7.0.0-preview.3.22158.2 (parent: Microsoft.NET.Sdk

* Update dependencies from https://github.com/dotnet/sdk build 20220311.5

Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 7.0.100-preview.3.22159.14 -> To Version 7.0.100-preview.3.22161.5

Dependency coherency updates

Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-secrets,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.Manifest-7.0.100
 From Version 7.0.0-preview.3.22151.6 -> To Version 7.0.0-preview.3.22160.15 (parent: Microsoft.NET.Sdk

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
 2022-03-23 17:56:05 +00:00
Michael Simons
211912bd41
Refactor SdkContentTests to warn on diffs when run in CI (#13432) 2022-03-23 12:25:05 -05:00
Michael Simons
a9d43d1d3d
Update NuGet path issue in Run Tests CI step (#13453) 2022-03-23 12:24:28 -05:00
dotnet-bot
c7c896d0bb Merge in 'release/6.0.1xx' changes 2022-03-21 13:25:22 +00:00
Michael Simons
46c2e6ddf7
Refactor build.sh to optimize PackageVersions.props retrieval (#13443) 2022-03-21 08:13:23 -05:00
DotNet Bot
4ff8f79c3d Merged PR 21732: [internal/release/6.0.2xx] Update dependencies from dnceng/internal/dotnet-sdk 
This pull request updates the following dependencies

[marker]: <> (Begin:Coherency Updates)
## Coherency Updates

The following updates ensure that dependencies with a *CoherentParentDependency*
attribute were produced in a build used as input to the parent dependency's build.
See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview)

[DependencyUpdate]: <> (Begin)

- **Coherency Updates**:
  - **Microsoft.WindowsDesktop.App.Ref**: from 6.0.3 to 6.0.4 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.3-servicing.22124.3 to 6.0.4-servicing.22165.2 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.3-servicing.22124.3 to 6.0.4-servicing.22165.2 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.3-servicing.22123.9 to 6.0.4-servicing.22164.4 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Ref**: from 6.0.3 to 6.0.4 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.3-servicing.22123.9 to 6.0.4-servicing.22164.4 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.3 to 6.0.4 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.3 to 6.0.4 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.3 to 6.0.4 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.Platforms**: from 6.0.2 to 6.0.3 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref**: from 6.0.3 to 6.0.4 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.3-servicing.22124.1 to 6.0.4-servicing.22167.10 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.3 to 6.0.4 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.3-servicing.22124.1 to 6.0.4-servicing.22167.10 (parent: Microsoft.NET.Sdk)
  - **dotnet-dev-certs**: from 6.0.3-servicing.22124.1 to 6.0.4-servicing.22167.10 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-secrets**: from 6.0.3-servicing.22124.1 to 6.0.4-servicing.22167.10 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.201 to 6.0.202 (parent: Microsoft.NET.Sdk)
  - **Microsoft.TemplateEngine.Cli**: from 6.0.201-servicing.22123.7 to 6.0.202-servicing.22165.5 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.201 to 6.0.202 (parent: Microsoft.NET.Sdk)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.3 to 6.0.4 (parent: Microsoft.NET.Sdk)
  - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.3-servicing.22123.7 to 6.0.4-servicing.22164.7 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.3 to 6.0...
 2022-03-21 01:08:23 +00:00
DotNet Bot
10e0e1e567 Merged PR 21560: [internal/release/6.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk 
This pull request updates the following dependencies

[marker]: <> (Begin:Coherency Updates)
## Coherency Updates

The following updates ensure that dependencies with a *CoherentParentDependency*
attribute were produced in a build used as input to the parent dependency's build.
See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview)

[DependencyUpdate]: <> (Begin)

- **Coherency Updates**:
  - **Microsoft.WindowsDesktop.App.Ref**: from 6.0.3 to 6.0.4 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.3-servicing.22124.3 to 6.0.4-servicing.22165.2 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.3-servicing.22124.3 to 6.0.4-servicing.22165.2 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Ref**: from 6.0.3 to 6.0.4 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.3-servicing.22123.9 to 6.0.4-servicing.22164.4 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.3 to 6.0.4 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.3 to 6.0.4 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.3 to 6.0.4 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.Platforms**: from 6.0.2 to 6.0.3 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref**: from 6.0.3 to 6.0.4 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.3-servicing.22124.1 to 6.0.4-servicing.22167.10 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.3 to 6.0.4 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.3-servicing.22124.1 to 6.0.4-servicing.22167.10 (parent: Microsoft.NET.Sdk)
  - **dotnet-dev-certs**: from 6.0.3-servicing.22124.1 to 6.0.4-servicing.22167.10 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-secrets**: from 6.0.3-servicing.22124.1 to 6.0.4-servicing.22167.10 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.103 to 6.0.104 (parent: Microsoft.NET.Sdk)
  - **Microsoft.TemplateEngine.Cli**: from 6.0.103-servicing.22123.6 to 6.0.104-servicing.22164.8 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.103 to 6.0.104 (parent: Microsoft.NET.Sdk)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.3 to 6.0.4 (parent: Microsoft.NET.Sdk)
  - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.3-servicing.22123.7 to 6.0.4-servicing.22164.7 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.3 to 6.0.4 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.3-servicing.22124.2 to 6.0.4-servicing.22165.3 (parent:...
 2022-03-21 01:07:52 +00:00
Jacques Eloff
887e46cae6 Add SDL checks 2022-03-20 01:29:22 -07:00
Michael Simons
57292e300c Make a source-build targetted fix to unblock release 2022-03-17 13:29:45 -05:00
Michael Simons
64addbe5bf Fix issue with BundledTemplates condition 2022-03-17 13:29:36 -05:00
Michael Simons
aff4e2553e Make a source-build targetted fix to unblock release 2022-03-17 12:38:23 -05:00
Michael Simons
fe2e9b9fb8 Fix issue with BundledTemplates condition 2022-03-17 10:57:41 -05:00
Jason Zhai
74bb220c7b Merge branch 'release/6.0.3xx' into main 2022-03-15 20:01:24 -07:00
Logan Bussell
bc714f97e9
[release/6.0.1xx] dotnet watch smoke test (#13392) 
* add dotnet watch smoke test
 2022-03-15 11:00:38 -07:00
Jason Zhai
b6ca26dd0b Merge branch 'release/6.0.1xx' into release/6.0.2xx 2022-03-15 01:56:45 -07:00
Marc Paine
6a8cc38b66
Merge pull request #13417 from dotnet/marcpopMSFT-fixduplicatepackages 
Revert prior templatelocator and msbuildextension changes as they weren't required
 2022-03-14 16:50:06 -07:00
Marc Paine
ab3ddec440 Revert prior changes as only the first and last change were actually needed. 2022-03-14 14:27:34 -07:00
Marc Paine
c365b60bad
Merge pull request #13390 from dotnet/marcpopMSFT-removemaui601 
Remove maui workloads from 6.0.100
 2022-03-14 14:22:49 -07:00
MichaelSimons
8ec456efa7 Remove unnecessary runtime source-build patch 2022-03-14 14:46:02 +00:00
Michael Simons
146dc6feac Correct difference in source-build pipeline pool references 2022-03-14 09:18:08 -05:00
Jason Zhai
61d316d9df Merge branch 'release/6.0.3xx' into main 2022-03-14 02:50:13 -07:00
Marc Paine
2d5f6fc8bd
Add additional hostfxr versions (#13404) 
* Update the nuspec as well to remove the duplicates

* Add additional architecture
 2022-03-11 18:57:30 -08:00
Michael Simons
a6c57692ab
Update source-build MsftToSbSdk.diff baseline (#13400) 2022-03-12 01:18:34 +00:00
Marc Paine
37f553ace2 Add additional architecture 2022-03-11 16:49:39 -08:00
Marc Paine
bfebed846a
Merge branch 'main' into merge/release/6.0.3xx-to-main 2022-03-11 15:57:47 -08:00
Michael Simons
69ea868ac1
Fix source-build graph in Version.Details.xml (#13384) 2022-03-11 15:53:22 -06:00
Michael Simons
1b84fc233f
Remove template text-only packages which are alread included in source-build (#13380) 2022-03-11 15:49:32 -06:00
Marc Paine
c9bae215ef
Merge pull request #13397 from dotnet/marcpopMSFT-fixduplicatepackages 
Only produce one version of the swr file.
 2022-03-11 11:56:16 -08:00
Michael Simons
a65da76e23
Merge pull request #13395 from dotnet-maestro-bot/merge/release/6.0.2xx-to-release/6.0.3xx 
[automated] Merge branch 'release/6.0.2xx' => 'release/6.0.3xx'
 2022-03-11 13:37:32 -06:00
Marc Paine
da96094fde Only produce one version of the swr file. 2022-03-11 10:17:05 -08:00
MichaelSimons
90153d2939 Remove aspnetcore patch that was backported 2022-03-11 15:02:26 +00:00
Jason Zhai
9fa0019355 Merge branch 'release/6.0.3xx' into main 2022-03-10 23:36:54 -08:00
Marc Paine
2cf433858f
Update the nuspec as well to remove the duplicates (#13393) 2022-03-10 20:07:24 -08:00