Commit graph

23405 commits

Author SHA1 Message Date
Matt Mitchell
345034987c
Update pre-release label to servicing 2022-05-25 07:21:17 -07:00
dotnet-maestro[bot]
cc9dfaf03e Update dependencies from https://github.com/dotnet/sdk build 20220525.2
Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.400-preview.22265.4 -> To Version 6.0.400-preview.22275.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.400-preview.22262.2 -> To Version 6.0.400-preview.22273.3 (parent: Microsoft.NET.Sdk
2022-05-25 09:20:43 +00:00
dotnet-maestro[bot]
eba30c0d65 Update dependencies from https://github.com/dotnet/sdk build 20220524.14
Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.400-preview.22265.4 -> To Version 6.0.400-preview.22274.14

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.400-preview.22262.2 -> To Version 6.0.400-preview.22273.3 (parent: Microsoft.NET.Sdk
2022-05-25 06:52:53 +00:00
DotNet Bot
4ab869cbcb Merged PR 23174: [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.FSharp.Compiler**: from 12.0.3-beta.22219.3 to 12.0.4-beta.22274.4 (parent: Microsoft.NET.Sdk)
  - **Microsoft.SourceBuild.Intermediate.fsharp**: from 6.0.4-beta.22219.3 to 6.0.5-beta.22274.4 (parent: Microsoft.NET.Sdk)

[DependencyUpdate]: <> (End)

[marker]: <> (End:Coherency Updates)

[marker]: <> (Begin:b5bca336-8d99-407e-c145-08d9d60066b9)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- **Subscription**: b5bca336-8d99-407e-c145-08d9d60066b9
- **Build**: 20220524.11
- **Date Produced**: May 24, 2022 11:44:49 PM UTC
- **Commit**: 8daa5f75dfc7592e30e28e71d448621d12442893
- **Branch**: refs/heads/internal/release/6.0.3xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.NET.Sdk**: [from 6.0.301-rtm.22273.19 to 6.0.301-rtm.22274.11][1]
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.301-rtm.22273.19 to 6.0.301-rtm.22274.11][1]
  - **Microsoft.FSharp.Compiler**: [from 12.0.3-beta.22219.3 to 12.0.4-beta.22274.4][2]
  - **Microsoft.SourceBuild.Intermediate.fsharp**: [from 6.0.4-beta.22219.3 to 6.0.5-beta.22274.4][2]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC04bbbea&targetVersion=GC8daa5f7&_a=files
[2]: 8854f5d...211fd76

[DependencyUpdate]: <> (End)

[marker]: <> (End:b5bca336-8d99-407e-c145-08d9d60066b9)
2022-05-25 00:18:22 +00:00
dotnet-bot
8111421fcc Merge in 'release/6.0.3xx' changes 2022-05-24 22:52:32 +00:00
Marc Paine
2cd1eed21f
Revert "Remove 16.04 ubuntu legs and old docker files." (#13862) 2022-05-24 15:40:53 -07:00
Marc Paine
167d8e1013
Revert "Remove 16.04 ubuntu legs and old docker files." (#13861) 2022-05-24 15:40:47 -07:00
Jonathan Peppers
735a05452d Update MAUI GA manifests
Context: https://aka.ms/dotnet/maui/6.0.300.json

Update to MAUI GA releases.

After `.\build.cmd -pack -publish`, manually tested the workloads:

    > .\bin\redist\Debug\dotnet\dotnet.exe workload install android --skip-manifest-update
    Installing pack Microsoft.Android.Sdk version 32.0.301...
    ...
    Installing pack Microsoft.NETCore.App.Runtime.Mono.android-arm version 6.0.5...

I updated `$(MonoWorkloadManifestVersion)` as we require at least
6.0.5 in MAUI GA.
2022-05-24 16:17:58 -05:00
Marc Paine
aea4d463e6
Update Dockerfile 2022-05-24 11:29:53 -07:00
Marc Paine
e61bb14403
Fix devscripts install 2022-05-24 10:31:29 -07:00
Marc Paine
c490ec42ef
Update Dockerfile 2022-05-24 10:07:47 -07:00
dotnet-maestro[bot]
d6d1e4a114 Update dependencies from https://github.com/dotnet/sdk build 20220523.25
Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.400-preview.22265.4 -> To Version 6.0.400-preview.22273.25

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.400-preview.22262.2 -> To Version 6.0.400-preview.22273.3 (parent: Microsoft.NET.Sdk
2022-05-24 03:27:04 +00:00
dotnet-maestro[bot]
f440d22a33 Update dependencies from https://github.com/dotnet/sdk build 20220523.21
Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.400-preview.22265.4 -> To Version 6.0.400-preview.22273.21

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.400-preview.22262.2 -> To Version 6.0.400-preview.22273.3 (parent: Microsoft.NET.Sdk
2022-05-23 22:53:46 +00:00
DotNet Bot
12e2f27948 Merged PR 23125: [internal/release/6.0.3xx] Update dependencies from dnceng/internal/dotnet-sdk
This pull request updates the following dependencies

[marker]: <> (Begin:b5bca336-8d99-407e-c145-08d9d60066b9)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- **Subscription**: b5bca336-8d99-407e-c145-08d9d60066b9
- **Build**: 20220523.19
- **Date Produced**: May 23, 2022 10:07:58 PM UTC
- **Commit**: 04bbbea262152499d549062f6763ff36daa65e75
- **Branch**: refs/heads/internal/release/6.0.3xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.NET.Sdk**: [from 6.0.301-rtm.22268.19 to 6.0.301-rtm.22273.19][1]
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.301-rtm.22268.19 to 6.0.301-rtm.22273.19][1]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCff8b547&targetVersion=GC04bbbea&_a=files

[DependencyUpdate]: <> (End)

[marker]: <> (End:b5bca336-8d99-407e-c145-08d9d60066b9)
2022-05-23 22:47:27 +00:00
dotnet-maestro[bot]
364d80b182 Update dependencies from https://github.com/dotnet/sdk build 20220523.16
Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.400-preview.22265.4 -> To Version 6.0.400-preview.22273.16

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.400-preview.22262.2 -> To Version 6.0.400-preview.22273.3 (parent: Microsoft.NET.Sdk
2022-05-23 21:45:32 +00:00
dotnet-maestro[bot]
e2f938e70b Update dependencies from https://github.com/dotnet/sdk build 20220523.1
Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.400-preview.22265.4 -> To Version 6.0.400-preview.22273.1

Dependency coherency updates

Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build
 From Version 12.0.4-beta.22262.2 -> To Version 12.0.4-beta.22269.4 (parent: Microsoft.NET.Sdk
2022-05-23 12:03:26 +00:00
dotnet-maestro[bot]
b06f625543 Update dependencies from https://github.com/dotnet/sdk build 20220522.4
Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.400-preview.22265.4 -> To Version 6.0.400-preview.22272.4

Dependency coherency updates

Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build
 From Version 12.0.4-beta.22262.2 -> To Version 12.0.4-beta.22269.4 (parent: Microsoft.NET.Sdk
2022-05-23 06:45:42 +00:00
dotnet-maestro[bot]
90156234d0 Update dependencies from https://github.com/dotnet/sdk build 20220520.11
Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.400-preview.22265.4 -> To Version 6.0.400-preview.22270.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.4-beta.22262.2 -> To Version 12.0.4-beta.22269.4 (parent: Microsoft.NET.Sdk
2022-05-21 00:20:53 +00:00
dotnet-maestro[bot]
4f4578fd4e Update dependencies from https://github.com/dotnet/sdk build 20220520.10
Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.400-preview.22265.4 -> To Version 6.0.400-preview.22270.10

Dependency coherency updates

Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build
 From Version 12.0.4-beta.22262.2 -> To Version 12.0.4-beta.22269.4 (parent: Microsoft.NET.Sdk
2022-05-20 23:09:43 +00:00
Marc Paine
b6032c3f2c
Merge pull request #13853 from dotnet-maestro-bot/merge/release/6.0.3xx-to-release/6.0.4xx
[automated] Merge branch 'release/6.0.3xx' => 'release/6.0.4xx'
2022-05-20 15:34:38 -07:00
dotnet-maestro[bot]
fc8b01c378 Update dependencies from https://github.com/dotnet/sdk build 20220520.1
Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.400-preview.22265.4 -> To Version 6.0.400-preview.22270.1

Dependency coherency updates

Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build
 From Version 12.0.4-beta.22262.2 -> To Version 12.0.4-beta.22269.4 (parent: Microsoft.NET.Sdk
2022-05-20 09:23:12 +00:00
dotnet-maestro[bot]
f6a6ffec1c Update dependencies from https://github.com/dotnet/sdk build 20220519.23
Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.400-preview.22265.4 -> To Version 6.0.400-preview.22269.23

Dependency coherency updates

Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build
 From Version 12.0.4-beta.22262.2 -> To Version 12.0.4-beta.22269.4 (parent: Microsoft.NET.Sdk
2022-05-20 03:01:26 +00:00
DotNet Bot
5652727602 Merged PR 23034: [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.6 to 6.0.6 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.6-servicing.22267.5 to 6.0.6-servicing.22268.6 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.6-servicing.22267.5 to 6.0.6-servicing.22268.6 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref**: from 6.0.6 to 6.0.6 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.6-servicing.22267.6 to 6.0.6-servicing.22268.5 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.6 to 6.0.6 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.6-servicing.22267.6 to 6.0.6-servicing.22268.5 (parent: Microsoft.NET.Sdk)
  - **dotnet-dev-certs**: from 6.0.6-servicing.22267.6 to 6.0.6-servicing.22268.5 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-secrets**: from 6.0.6-servicing.22267.6 to 6.0.6-servicing.22268.5 (parent: Microsoft.NET.Sdk)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.6 to 6.0.6 (parent: Microsoft.NET.Sdk)
  - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.6-servicing.22266.9 to 6.0.6-servicing.22267.5 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.6 to 6.0.6 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.6-servicing.22267.2 to 6.0.6-servicing.22268.4 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)

[DependencyUpdate]: <> (End)

[marker]: <> (End:Coherency Updates)

[marker]: <> (Begin:b5bca336-8d99-407e-c145-08d9d60066b9)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- **Subscription**: b5bca336-8d99-407e-c145-08d9d60066b9
- **Build**: 20220518.19
- **Date Produced**: May 18, 2022 10:26:37 PM UTC
- **Commit**: ff8b54790e2848932bc93233ea19f8dcd2e7c26f
- **Branch**: refs/heads/internal/release/6.0.3xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.NET.Sdk**: [from 6.0.301-rtm.22268.5 to 6.0.301-rtm.22268.19][1]
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.301-rtm.22268.5 to 6.0.301-rtm.22268.19][1]
  - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.6 to 6.0.6][2]
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.6-servicing.22267.5 to 6.0.6-servicing.22268.6][2]
  - **VS.Redist.Co...
2022-05-19 14:27:48 +00:00
dotnet-maestro[bot]
988aa00ffc Update dependencies from https://github.com/dotnet/sdk build 20220519.3
Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.400-preview.22265.4 -> To Version 6.0.400-preview.22269.3

Dependency coherency updates

Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build
 From Version 12.0.4-beta.22262.2 -> To Version 12.0.4-beta.22266.2 (parent: Microsoft.NET.Sdk
2022-05-19 09:48:50 +00:00
Jason Zhai
63b29c2305 Revert changes to eng/folder from branch merge 2022-05-18 20:14:23 -07:00
DotNet Bot
cc7da5b9f3 Merged PR 23001: [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.6 to 6.0.6 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.6-servicing.22260.6 to 6.0.6-servicing.22267.5 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.6-servicing.22260.6 to 6.0.6-servicing.22267.5 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.6-servicing.22255.10 to 6.0.6-servicing.22267.7 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Ref**: from 6.0.6 to 6.0.6 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.6-servicing.22255.10 to 6.0.6-servicing.22267.7 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.6 to 6.0.6 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.6 to 6.0.6 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.6 to 6.0.6 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.Platforms**: from 6.0.3 to 6.0.4 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref**: from 6.0.6 to 6.0.6 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.6-servicing.22260.10 to 6.0.6-servicing.22267.6 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.6 to 6.0.6 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.6-servicing.22260.10 to 6.0.6-servicing.22267.6 (parent: Microsoft.NET.Sdk)
  - **dotnet-dev-certs**: from 6.0.6-servicing.22260.10 to 6.0.6-servicing.22267.6 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-secrets**: from 6.0.6-servicing.22260.10 to 6.0.6-servicing.22267.6 (parent: Microsoft.NET.Sdk)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.6 to 6.0.6 (parent: Microsoft.NET.Sdk)
  - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.6-servicing.22255.2 to 6.0.6-servicing.22266.9 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.6 to 6.0.6 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.6-servicing.22255.5 to 6.0.6-servicing.22267.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)

[DependencyUpdate]: <> (End)

[marker]: <> (End:Coherency Updates)

[marker]: <> (Begin:b5bca336-8d99-407e-c145-08d9d60066b9)
## Fro...
2022-05-18 21:57:33 +00:00
dotnet-maestro[bot]
808804b54d Update dependencies from https://github.com/dotnet/sdk build 20220518.13
Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.400-preview.22265.4 -> To Version 6.0.400-preview.22268.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.4-beta.22262.2 -> To Version 12.0.4-beta.22266.2 (parent: Microsoft.NET.Sdk
2022-05-18 19:57:21 +00:00
dotnet-bot
8897391684 Merge in 'release/6.0.3xx' changes 2022-05-18 19:06:01 +00:00
Marc Paine
2b03ed99b7
Merge pull request #13828 from dotnet-maestro-bot/merge/release/6.0.1xx-to-release/6.0.3xx
[automated] Merge branch 'release/6.0.1xx' => 'release/6.0.3xx'
2022-05-18 11:54:09 -07:00
DotNet Bot
3b5b37d71d Merged PR 23016: [internal/release/6.0.3xx] Update dependencies from dotnet/source-build-reference-packages
This pull request updates the following dependencies

[marker]: <> (Begin:4fe19a4b-6691-493a-bfdf-08da32c0fb1e)
## From https://github.com/dotnet/source-build-reference-packages
- **Subscription**: 4fe19a4b-6691-493a-bfdf-08da32c0fb1e
- **Build**: 20220518.1
- **Date Produced**: May 18, 2022 2:03:24 PM UTC
- **Commit**: 8ea40b4e4a381b819a7f9946e72d036f37cb75d4
- **Branch**: refs/heads/release/6.0

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.SourceBuild.Intermediate.source-build-reference-packages**: [from 6.0.0-servicing.22262.1 to 6.0.0-servicing.22268.1][1]

[1]: 07eecdd...8ea40b4

[DependencyUpdate]: <> (End)

[marker]: <> (End:4fe19a4b-6691-493a-bfdf-08da32c0fb1e)
2022-05-18 16:15:17 +00:00
dotnet-maestro[bot]
1d7424d93b Update dependencies from https://github.com/dotnet/sdk build 20220518.1
Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.400-preview.22265.4 -> To Version 6.0.400-preview.22268.1

Dependency coherency updates

Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build
 From Version 12.0.4-beta.22262.2 -> To Version 12.0.4-beta.22266.2 (parent: Microsoft.NET.Sdk
2022-05-18 08:11:40 +00:00
dotnet-maestro[bot]
ad148b922c Update dependencies from https://github.com/dotnet/sdk build 20220517.17
Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.400-preview.22265.4 -> To Version 6.0.400-preview.22267.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.4-beta.22262.2 -> To Version 12.0.4-beta.22266.2 (parent: Microsoft.NET.Sdk
2022-05-17 22:28:36 +00:00
dotnet-maestro[bot]
dce53aeba1 Update dependencies from https://github.com/dotnet/sdk build 20220517.11
Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.400-preview.22265.4 -> To Version 6.0.400-preview.22267.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.4-beta.22262.2 -> To Version 12.0.4-beta.22266.2 (parent: Microsoft.NET.Sdk
2022-05-17 19:47:22 +00:00
DotNet Bot
35b5a8783d Merged PR 22971: [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**:
  - **NuGet.Build.Tasks**: from 6.2.0-rc.146 to 6.2.1-rc.2 (parent: Microsoft.NET.Sdk)

[DependencyUpdate]: <> (End)

[marker]: <> (End:Coherency Updates)

[marker]: <> (Begin:b5bca336-8d99-407e-c145-08d9d60066b9)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- **Subscription**: b5bca336-8d99-407e-c145-08d9d60066b9
- **Build**: 20220516.33
- **Date Produced**: May 16, 2022 10:53:49 PM UTC
- **Commit**: 0ffb32f6130125c44acbd6fbc314d9c9e34c7c0c
- **Branch**: refs/heads/internal/release/6.0.3xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.NET.Sdk**: [from 6.0.301-rtm.22262.4 to 6.0.301-rtm.22266.33][5]
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.301-rtm.22262.4 to 6.0.301-rtm.22266.33][5]
  - **NuGet.Build.Tasks**: [from 6.2.0-rc.146 to 6.2.1-rc.2][6]

[5]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCa78ea1e&targetVersion=GC0ffb32f&_a=files
[6]: https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted/branches?baseVersion=GCb8a6126&targetVersion=GCa8942f4&_a=files

[DependencyUpdate]: <> (End)

[marker]: <> (End:b5bca336-8d99-407e-c145-08d9d60066b9)
2022-05-17 16:49:13 +00:00
dotnet-maestro[bot]
4e28c5a6be Update dependencies from https://github.com/dotnet/sdk build 20220517.1
Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.400-preview.22265.4 -> To Version 6.0.400-preview.22267.1

Dependency coherency updates

Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build
 From Version 12.0.4-beta.22262.2 -> To Version 12.0.4-beta.22266.2 (parent: Microsoft.NET.Sdk
2022-05-17 09:20:17 +00:00
dotnet-maestro[bot]
9f2e7c22c5 Update dependencies from https://github.com/dotnet/sdk build 20220516.48
Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.400-preview.22265.4 -> To Version 6.0.400-preview.22266.48

Dependency coherency updates

Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build
 From Version 12.0.4-beta.22262.2 -> To Version 12.0.4-beta.22266.2 (parent: Microsoft.NET.Sdk
2022-05-17 04:22:40 +00:00
dotnet-maestro[bot]
500d20e8e4 Update dependencies from https://github.com/dotnet/sdk build 20220516.46
Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.400-preview.22265.4 -> To Version 6.0.400-preview.22266.46

Dependency coherency updates

Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build
 From Version 12.0.4-beta.22262.2 -> To Version 12.0.4-beta.22266.2 (parent: Microsoft.NET.Sdk
2022-05-17 03:20:57 +00:00
DotNet Bot
f477fd69d2 Merged PR 22884: [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.5 to 6.0.6 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.5-servicing.22227.2 to 6.0.6-servicing.22260.6 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.5-servicing.22227.2 to 6.0.6-servicing.22260.6 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.5-servicing.22213.9 to 6.0.6-servicing.22255.10 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Ref**: from 6.0.5 to 6.0.6 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.5-servicing.22213.9 to 6.0.6-servicing.22255.10 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.5 to 6.0.6 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.5 to 6.0.6 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.5 to 6.0.6 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref**: from 6.0.5 to 6.0.6 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.5-servicing.22218.2 to 6.0.6-servicing.22260.10 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.5 to 6.0.6 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.5-servicing.22218.2 to 6.0.6-servicing.22260.10 (parent: Microsoft.NET.Sdk)
  - **dotnet-dev-certs**: from 6.0.5-servicing.22218.2 to 6.0.6-servicing.22260.10 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-secrets**: from 6.0.5-servicing.22218.2 to 6.0.6-servicing.22260.10 (parent: Microsoft.NET.Sdk)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.5 to 6.0.6 (parent: Microsoft.NET.Sdk)
  - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.5-servicing.22214.3 to 6.0.6-servicing.22255.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.5 to 6.0.6 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.5-servicing.22215.11 to 6.0.6-servicing.22255.5 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)

[DependencyUpdate]: <> (End)

[marker]: <> (End:Coherency Updates)

[marker]: <> (Begin:b5bca336-8d99-407e-c145-08d9d60066b9)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- **Subscription**: b5bca336-8...
2022-05-16 18:14:23 +00:00
dotnet-maestro[bot]
1e82ac26a5 Update dependencies from https://github.com/dotnet/sdk build 20220516.11
Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.400-preview.22265.4 -> To Version 6.0.400-preview.22266.11

Dependency coherency updates

Microsoft.NET.ILLink.Tasks,Microsoft.Build
 From Version 6.0.200-1.22219.3 -> To Version 6.0.200-1.22178.2 (parent: Microsoft.NET.Sdk
2022-05-16 17:26:18 +00:00
dotnet-maestro[bot]
5bd0203039 Update dependencies from https://github.com/dotnet/sdk build 20220516.1
Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.400-preview.22265.4 -> To Version 6.0.400-preview.22266.1

Dependency coherency updates

Microsoft.NET.ILLink.Tasks,Microsoft.Build
 From Version 6.0.200-1.22219.3 -> To Version 6.0.200-1.22178.2 (parent: Microsoft.NET.Sdk
2022-05-16 12:55:04 +00:00
v-wuzhai
c35149d617
Merge pull request #13827 from dotnet/darc-release/6.0.4xx-7971234b-3db5-4f21-9c03-7834d7e3485e
[release/6.0.4xx] Update dependencies from dotnet/sdk
2022-05-16 02:10:15 -07:00
Jason Zhai
6e89ea62c7 Merge branch 'release/6.0.1xx' into release/6.0.3xx 2022-05-15 21:30:09 -07:00
dotnet-maestro[bot]
f9a11cb355 Update dependencies from https://github.com/dotnet/sdk build 20220515.4
Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.400-preview.22260.30 -> To Version 6.0.400-preview.22265.4

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.400-preview.22259.1 -> To Version 6.0.400-preview.22262.2 (parent: Microsoft.NET.Sdk
2022-05-16 04:17:28 +00:00
v-wuzhai
33a917a62a
Merge pull request #13809 from dotnet-maestro-bot/merge/release/6.0.3xx-to-release/6.0.4xx
[automated] Merge branch 'release/6.0.3xx' => 'release/6.0.4xx'
2022-05-15 20:08:19 -07:00
dotnet-maestro[bot]
cd64d69bd1 Update dependencies from https://github.com/dotnet/sdk build 20220513.32
Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.400-preview.22260.30 -> To Version 6.0.400-preview.22263.32

Dependency coherency updates

Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,VS.Redist.Common.NetCore.SharedFramework.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.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.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset,Microsoft.Build
 From Version 6.0.4 -> To Version 6.0.5 (parent: Microsoft.NET.Sdk
2022-05-13 22:09:56 +00:00
dotnet-bot
ff8a643a89 Merge in 'release/6.0.3xx' changes 2022-05-13 21:36:00 +00:00
Doug Bunting
e3c78bf16d
[6.0.3xx] Update template versions from dotnet/aspnetcore (#13840) 2022-05-13 14:24:38 -07:00
Doug Bunting
ff5d93bff8
[6.0.4xx] Update template versions from dotnet/aspnetcore (#13841) 2022-05-13 14:24:31 -07:00
Doug Bunting
ee1b7085a6
[6.0.1xx] Update template versions from dotnet/aspnetcore (#13839) 2022-05-13 14:24:13 -07:00
dotnet-maestro[bot]
b14efdd3e8 Update dependencies from https://github.com/dotnet/sdk build 20220513.20
Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.400-preview.22260.30 -> To Version 6.0.400-preview.22263.20

Dependency coherency updates

Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,VS.Redist.Common.NetCore.SharedFramework.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.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.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset,Microsoft.Build
 From Version 6.0.4 -> To Version 6.0.5 (parent: Microsoft.NET.Sdk
2022-05-13 18:41:45 +00:00