Commit graph

23389 commits

Author SHA1 Message Date
dotnet-maestro[bot]
0e6be41bed Update dependencies from https://github.com/dotnet/sdk build 20220601.26
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.400-preview.22301.10 -> To Version 6.0.400-preview.22301.26

Dependency coherency updates

Microsoft.Net.Compilers.Toolset
 From Version 4.3.0-3.22281.14 -> To Version 4.3.0-3.22301.10 (parent: Microsoft.NET.Sdk
2022-06-02 07:21:05 +00:00
Marc Paine
25580ffe7a
Merge pull request #13893 from dotnet/darc-release/6.0.4xx-6d347bd5-638d-4d8e-94d0-20bc13c73189
[release/6.0.4xx] Update dependencies from dotnet/sdk
2022-06-01 12:33:44 -07:00
dotnet-maestro[bot]
9db9aec098 Update dependencies from https://github.com/dotnet/sdk build 20220601.10
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.400-preview.22301.1 -> To Version 6.0.400-preview.22301.10

Dependency coherency updates

Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset
 From Version 12.0.4-beta.22281.2 -> To Version 12.0.4-beta.22281.4 (parent: Microsoft.NET.Sdk
2022-06-01 18:15:29 +00:00
dotnet-maestro[bot]
887ca99c18 Update dependencies from https://github.com/dotnet/sdk build 20220601.8
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.400-preview.22301.1 -> To Version 6.0.400-preview.22301.8
2022-06-01 17:09:10 +00:00
Grace Kulin
4882bd2982
Merge pull request #13891 from dotnet/darc-release/6.0.4xx-cdab1687-de62-4454-8d0c-c27624d80eb1
[release/6.0.4xx] Update dependencies from dotnet/sdk
2022-06-01 09:37:13 -07:00
dotnet-maestro[bot]
5a024b782e Update dependencies from https://github.com/dotnet/sdk build 20220601.1
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.400-preview.22281.20 -> To Version 6.0.400-preview.22301.1

Dependency coherency updates

NuGet.Build.Tasks
 From Version 6.3.0-preview.2.66 -> To Version 6.3.0-preview.2.73 (parent: Microsoft.NET.Sdk
2022-06-01 10:23:00 +00:00
v-wuzhai
9291c3ac27
Merge pull request #13890 from dotnet/darc-release/6.0.4xx-bbaa9ba0-8811-4cb5-bd59-f377f132124b
[release/6.0.4xx] Update dependencies from dotnet/sdk
2022-06-01 03:09:35 -07:00
dotnet-maestro[bot]
43ff73901f Update dependencies from https://github.com/dotnet/sdk build 20220531.20
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.400-preview.22281.13 -> To Version 6.0.400-preview.22281.20

Dependency coherency updates

Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp
 From Version 12.0.4-beta.22278.1 -> To Version 12.0.4-beta.22281.2 (parent: Microsoft.NET.Sdk
2022-06-01 07:08:03 +00:00
v-wuzhai
1d6c619b58
Merge pull request #13888 from dotnet/darc-release/6.0.4xx-53e6a840-a696-4b08-a2f5-3fdae53c175a
[release/6.0.4xx] Update dependencies from dotnet/sdk
2022-05-31 19:50:44 -07:00
dotnet-maestro[bot]
b5d27ce9ab Update dependencies from https://github.com/dotnet/sdk build 20220531.13
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.400-preview.22281.6 -> To Version 6.0.400-preview.22281.13

Dependency coherency updates

Microsoft.Net.Compilers.Toolset
 From Version 4.3.0-2.22280.1 -> To Version 4.3.0-2.22281.1 (parent: Microsoft.NET.Sdk
2022-06-01 01:29:22 +00:00
dotnet-maestro[bot]
a641083495 Update dependencies from https://github.com/dotnet/sdk build 20220531.11
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.400-preview.22281.6 -> To Version 6.0.400-preview.22281.11

Dependency coherency updates

Microsoft.Net.Compilers.Toolset
 From Version 4.3.0-2.22280.1 -> To Version 4.3.0-2.22281.1 (parent: Microsoft.NET.Sdk
2022-05-31 23:57:32 +00:00
dotnet-maestro[bot]
91b739db17 Update dependencies from https://github.com/dotnet/sdk build 20220531.8
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.400-preview.22281.6 -> To Version 6.0.400-preview.22281.8

Dependency coherency updates

Microsoft.Net.Compilers.Toolset
 From Version 4.3.0-2.22280.1 -> To Version 4.3.0-2.22281.1 (parent: Microsoft.NET.Sdk
2022-05-31 22:55:57 +00:00
Grace Kulin
2d621f8faa
Merge pull request #13886 from dotnet/darc-release/6.0.4xx-99321d94-19d2-4783-b750-e57fe8ff3e04
[release/6.0.4xx] Update dependencies from dotnet/sdk
2022-05-31 13:38:26 -07:00
dotnet-maestro[bot]
083cda29c1 Update dependencies from https://github.com/dotnet/sdk build 20220531.6
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.400-preview.22280.1 -> To Version 6.0.400-preview.22281.6

Dependency coherency updates

Microsoft.Net.Compilers.Toolset
 From Version 4.3.0-2.22278.4 -> To Version 4.3.0-2.22280.1 (parent: Microsoft.NET.Sdk
2022-05-31 19:33:10 +00:00
v-wuzhai
e0cdfc3157
Merge pull request #13845 from dotnet/darc-release/6.0.4xx-99c094e8-4bbe-4024-83b6-dc798fac75b7
[release/6.0.4xx] Update dependencies from dotnet/sdk
2022-05-30 20:22:59 -07:00
v-wuzhai
5168614a62
Merge pull request #13884 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-30 19:05:27 -07:00
Marc Paine
99accb6a1a Ran update-dependencies on build 133323 and manually pushing 2022-05-30 18:29:17 -07:00
dotnet-maestro[bot]
b917e77ecf Update dependencies from https://github.com/dotnet/sdk build 20220530.1
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.400-preview.22265.4 -> To Version 6.0.400-preview.22280.1

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.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks
 From Version 6.0.400-preview.22262.2 -> To Version 6.0.400-preview.22276.4 (parent: Microsoft.NET.Sdk
2022-05-30 08:10:07 +00:00
v-wuzhai
283e9cfd19
Merge pull request #13868 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-29 23:59:55 -07:00
dotnet-maestro[bot]
720dcd9117 Update dependencies from https://github.com/dotnet/sdk build 20220529.6
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.400-preview.22265.4 -> To Version 6.0.400-preview.22279.6

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.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks
 From Version 6.0.400-preview.22262.2 -> To Version 6.0.400-preview.22275.2 (parent: Microsoft.NET.Sdk
2022-05-30 06:48:36 +00:00
Jason Zhai
672289ca16 Merge branch 'release/6.0.1xx' into release/6.0.3xx 2022-05-29 23:04:05 -07:00
dotnet-maestro[bot]
a267c532f7 Update dependencies from https://github.com/dotnet/sdk build 20220529.3
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.400-preview.22265.4 -> To Version 6.0.400-preview.22279.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.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks
 From Version 6.0.400-preview.22262.2 -> To Version 6.0.400-preview.22275.2 (parent: Microsoft.NET.Sdk
2022-05-30 04:49:56 +00:00
Marc Paine
949b047558
Merge pull request #13880 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-27 16:30:26 -07:00
dotnet-bot
43f9b18481 Merge in 'release/6.0.3xx' changes 2022-05-27 18:09:36 +00:00
Marc Paine
6ff814b706
Merge pull request #13879 from dotnet/marcpopMSFT-fiximpl603
Update GenerateBundledVersions.targets
2022-05-27 10:57:34 -07:00
Marc Paine
0632d08f8d
Merge pull request #13878 from dotnet/marcpopMSFT-fiximplicitversion
Update GenerateBundledVersions.targets
2022-05-27 10:57:18 -07:00
Marc Paine
8845807f72
Update GenerateBundledVersions.targets 2022-05-27 10:22:17 -07:00
Marc Paine
6c07a124b9
Update GenerateBundledVersions.targets 2022-05-27 10:20:07 -07:00
Marc Paine
b4a0367530
Merge pull request #13867 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-26 09:15:39 -07:00
dotnet-maestro[bot]
8fd1c7203e Update dependencies from https://github.com/dotnet/sdk build 20220526.3
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.400-preview.22265.4 -> To Version 6.0.400-preview.22276.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.400-preview.22262.2 -> To Version 6.0.400-preview.22275.2 (parent: Microsoft.NET.Sdk
2022-05-26 11:29:05 +00:00
dotnet-maestro[bot]
fd9a3f2786 Update dependencies from https://github.com/dotnet/sdk build 20220526.1
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.400-preview.22265.4 -> To Version 6.0.400-preview.22276.1

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.400-preview.22262.2 -> To Version 6.0.400-preview.22273.3 (parent: Microsoft.NET.Sdk
2022-05-26 09:22:21 +00:00
Marc Paine
4ba8c44fad Remove the old docker files 2022-05-25 16:35:08 -07:00
Marc Paine
c2d2d79875 Merge remote-tracking branch 'origin/release/6.0.1xx' into marcpopMSFT-fixdebbuild 2022-05-25 16:31:41 -07:00
Marc Paine
a73bedf093
Merge pull request #13866 from jonathanpeppers/maui-6.0.4xx
[release/6.0.4xx] Update MAUI GA manifests
2022-05-25 13:33:45 -07:00
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