Commit graph

22407 commits

Author SHA1 Message Date
William Godbe
f13c273745
Update asp.net templates (#13194) 2022-02-08 16:30:48 -08:00
dotnet-maestro[bot]
c506cfba13
[release/6.0.2xx] Update dependencies from dotnet/source-build-reference-packages (#13177)
* Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220205.1

Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 6.0.0-servicing.22103.1 -> To Version 6.0.0-servicing.22105.1

* Update NuGet.config

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Jason Zhai <v-wuzhai@microsoft.com>
2022-02-07 08:32:20 -08:00
Marc Paine
9049a306f6
Update .vsts-ci.yml 2022-02-06 09:40:53 -08:00
Marc Paine
50f3a050ee
Merge pull request #13176 from dotnet/marcpopMSFT-marcpopimplicitversions6.0.2xx
Fix up implicit versions
2022-02-04 16:14:18 -08:00
Marc Paine
6efd1da62e
Fix up implicit versions 2022-02-04 15:13:25 -08:00
Marc Paine
2be4952f19
Merge pull request #13167 from jonathanpeppers/maui/release/6.0.2xx
Update manifests for MAUI Preview 13
2022-02-03 22:09:48 -08:00
Marc Paine
e6c196b1fe
Update NuGet.config 2022-02-03 13:13:32 -08:00
Marc Paine
e8ae2d7900
Use unstable runtime workload version 2022-02-03 11:02:59 -08:00
Marc Paine
a7d8ea65b7
Switch source build package over to 6.0.200 manifests 2022-02-03 10:21:59 -08:00
Marc Paine
26b2dca100
Updated the runtime manifests 2022-02-03 10:21:04 -08:00
Marc Paine
8b453b9ece
Update the Versions for 6.0.200 runtime manifests 2022-02-03 10:21:02 -08:00
Marc Paine
693d4ca811
Merge pull request #13166 from dotnet/darc-release/6.0.2xx-39191f28-54d4-4731-a517-282ec9f77479
[release/6.0.2xx] Update dependencies from dotnet/arcade
2022-02-03 09:47:41 -08:00
Jonathan Peppers
519c661235 Update manifests for MAUI Preview 13
Insertion: 38aa7894a1
Bump to: xamarin/xamarin-android/release/6.0.2xx-preview13@d23abbd7
Bump to: xamarin/xamarin-macios/release/6.0.2xx-preview13@88f54c5e
Bump to: dotnet/maui/release/6.0.2xx-preview13@8354ef23

The .NET MAUI workload manifests are now 6.0.200. This also uses the
builds we are tentatively shipping for Preview 13.

Note, that I think xamarin-macios had to adjust their version numbers
for other reasons. Their x.x.301 builds should align to 6.0.200.

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

    > $env:DOTNET_MULTILEVEL_LOOKUP=0
    > .\artifacts\bin\redist\Debug\dotnet\dotnet.exe workload install android --skip-manifest-update
    Installing pack Microsoft.Android.Sdk version 31.0.200-preview.13.41...
    ...
    > .\artifacts\bin\redist\Debug\dotnet\dotnet.exe workload install ios --skip-manifest-update
    Installing pack Microsoft.iOS.Sdk version 15.2.301-preview.13.2...
    ...
    > .\artifacts\bin\redist\Debug\dotnet\dotnet.exe workload install maccatalyst --skip-manifest-update
    Installing pack Microsoft.MacCatalyst.Sdk version 15.2.301-preview.13.2...
    ...
    > .\artifacts\bin\redist\Debug\dotnet\dotnet.exe workload install macos --skip-manifest-update
    Installing pack Microsoft.macOS.Sdk version 12.1.301-preview.13.2...
    ...
    > .\artifacts\bin\redist\Debug\dotnet\dotnet.exe workload install tvos --skip-manifest-update
    Installing pack Microsoft.tvOS.Sdk version 15.2.301-preview.13.2...
    ...
    > .\artifacts\bin\redist\Debug\dotnet\dotnet.exe workload install maui --skip-manifest-update
    Installing pack Microsoft.Maui.Core.Ref.android version 6.0.200-preview.13.2747...
2022-02-03 10:56:15 -06:00
dotnet-maestro[bot]
dd985cd8bb
Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220203.1 (#13162)
[release/6.0.2xx] Update dependencies from dotnet/source-build-reference-packages
2022-02-03 16:44:12 +00:00
dotnet-maestro[bot]
2f9557e2ba Update dependencies from https://github.com/dotnet/arcade build 20220202.3
Microsoft.DotNet.CMake.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Arcade.Sdk
 From Version 6.0.0-beta.21609.4 -> To Version 6.0.0-beta.22102.3
2022-02-03 16:05:33 +00:00
Marc Paine
c12c477cb6
Merge pull request #13137 from dotnet/marcpopMSFT-poolupdate602
Update pools
2022-02-01 14:37:08 -08:00
Marc Paine
94086dc351
Update .vsts-ci.yml 2022-01-31 13:50:23 -08:00
dotnet-maestro[bot]
e950d07146
[release/6.0.2xx] Update dependencies from dotnet/source-build-reference-packages (#13143)
[release/6.0.2xx] Update dependencies from dotnet/source-build-reference-packages


 - Update NuGet.config
2022-01-29 07:02:00 +00:00
dotnet-maestro[bot]
dcd221cebd
[release/6.0.2xx] Update dependencies from dotnet/source-build-reference-packages (#13131)
[release/6.0.2xx] Update dependencies from dotnet/source-build-reference-packages


 - Update NuGet.config
2022-01-28 07:14:24 +00:00
Marc Paine
10ea11c697 Fix the public pool 2022-01-27 14:27:36 -08:00
Marc Paine
d5f1719538 Update .vsts-ci.yml 2022-01-27 14:26:10 -08:00
Marc Paine
45131a3283
Merge pull request #13126 from dotnet/darc-release/6.0.2xx-610272e8-350b-49bd-b20e-9f835aab1369
[release/6.0.2xx] Update dependencies from dotnet/sdk
2022-01-27 10:14:21 -08:00
Jason Zhai
24e2b948e6 Update NuGet.config 2022-01-26 22:17:58 -08:00
dotnet-maestro[bot]
d257a5eb1a Update dependencies from https://github.com/dotnet/sdk build 20220126.18
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.200-rtm.22075.18 -> To Version 6.0.200-rtm.22076.18

Dependency coherency updates

Microsoft.Build
 From Version 17.1.0-preview-22075-05 -> To Version 17.1.0 (parent: Microsoft.NET.Sdk
2022-01-27 04:39:04 +00:00
Marc Paine
d0b45b2ddb
Merge pull request #13115 from dotnet/darc-release/6.0.2xx-dfffbcb6-4171-4486-abec-77842c739f49
[release/6.0.2xx] Update dependencies from dotnet/sdk
2022-01-26 14:42:30 -08:00
William Godbe
470bf457d0
Update NuGet.config 2022-01-26 10:29:45 -08:00
Jason Zhai
0e191ca51b Restore the NuGet.config file 2022-01-25 23:07:33 -08:00
dotnet-maestro[bot]
8b1a04777f Update dependencies from https://github.com/dotnet/sdk build 20220125.18
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.200-rtm.22074.1 -> To Version 6.0.200-rtm.22075.18

Dependency coherency updates

Microsoft.Net.Compilers.Toolset,Microsoft.Build
 From Version 4.1.0-3.22071.8 -> To Version 4.1.0-3.22075.3 (parent: Microsoft.NET.Sdk
2022-01-26 05:05:50 +00:00
dotnet-maestro[bot]
13beb40bd4 Update dependencies from https://github.com/dotnet/sdk build 20220125.12
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.200-rtm.22074.1 -> To Version 6.0.200-rtm.22075.12

Dependency coherency updates

Microsoft.Build
 From Version 17.1.0-preview-22063-01 -> To Version 17.1.0-preview-22075-05 (parent: Microsoft.NET.Sdk
2022-01-26 00:04:00 +00:00
Marc Paine
16f3f632ad
Merge pull request #12981 from dotnet/darc-release/6.0.2xx-804c3b8c-7c2a-4109-a7c2-2d0451821142
[release/6.0.2xx] Update dependencies from dotnet/sdk
2022-01-25 10:56:21 -08:00
William Godbe
1097fbf183
Update NuGet.config 2022-01-24 14:48:48 -08:00
Marc Paine
52d6372469
Merge pull request #13103 from dotnet/marcpopMSFT-2xxbranding
stabilize branding for release
2022-01-24 11:46:54 -08:00
dotnet-maestro[bot]
e2d39eca2b Update dependencies from https://github.com/dotnet/sdk build 20220124.1
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.200-preview.22055.23 -> To Version 6.0.200-rtm.22074.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.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks
 From Version 6.0.200-preview.21623.5 -> To Version 6.0.200 (parent: Microsoft.NET.Sdk
2022-01-24 19:21:43 +00:00
Marc Paine
3de22e2a28 stabilize branding for release 2022-01-21 15:04:38 -08:00
dotnet-maestro[bot]
3c0c7a1f37 Update dependencies from https://github.com/dotnet/sdk build 20220121.4
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.200-preview.22055.23 -> To Version 6.0.200-preview.22071.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.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks
 From Version 6.0.200-preview.21623.5 -> To Version 6.0.200-preview.22062.10 (parent: Microsoft.NET.Sdk
2022-01-21 22:15:14 +00:00
Marc Paine
9d335dacf2
Merge pull request #13098 from dotnet/marcpopMSFT-publishpool60200
Update .vsts-ci.yml for windows pool
2022-01-21 11:16:22 -08:00
Marc Paine
69b52eef81 Update .vsts-ci.yml 2022-01-21 10:51:24 -08:00
dotnet-maestro[bot]
e9b4d50445
Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220120.1 (#13091)
[release/6.0.2xx] Update dependencies from dotnet/source-build-reference-packages
2022-01-20 15:53:47 +00:00
dotnet-maestro[bot]
0f94224fa0 Update dependencies from https://github.com/dotnet/sdk build 20220119.13
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.200-preview.22055.23 -> To Version 6.0.200-preview.22069.13

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.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks
 From Version 6.0.200-preview.21623.5 -> To Version 6.0.200-preview.22062.10 (parent: Microsoft.NET.Sdk
2022-01-20 02:06:31 +00:00
dotnet-maestro[bot]
0dd347db34 Update dependencies from https://github.com/dotnet/sdk build 20220119.11
Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.200-preview.22055.23 -> To Version 6.0.200-preview.22069.11

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.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks
 From Version 6.0.200-preview.21623.5 -> To Version 6.0.200-preview.22062.10 (parent: Microsoft.NET.Sdk
2022-01-20 00:37:15 +00:00
dotnet-maestro[bot]
231c11fddc
Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220119.2 (#13085)
Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 6.0.0-servicing.22069.1 -> To Version 6.0.0-servicing.22069.2

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
2022-01-19 18:57:48 +00:00
dotnet-maestro[bot]
0ff982cb3f Update dependencies from https://github.com/dotnet/sdk build 20220119.5
Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.200-preview.22055.23 -> To Version 6.0.200-preview.22069.5

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.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks
 From Version 6.0.200-preview.21623.5 -> To Version 6.0.200-preview.22062.10 (parent: Microsoft.NET.Sdk
2022-01-19 18:46:21 +00:00
dotnet-maestro[bot]
c90f7a2280
Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220119.1 (#13083)
[release/6.0.2xx] Update dependencies from dotnet/source-build-reference-packages
2022-01-19 15:01:14 +00:00
dotnet-maestro[bot]
aa25a1f5b4 Update dependencies from https://github.com/dotnet/sdk build 20220119.1
Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.200-preview.22055.23 -> To Version 6.0.200-preview.22069.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.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks
 From Version 6.0.200-preview.21623.5 -> To Version 6.0.200-preview.22062.10 (parent: Microsoft.NET.Sdk
2022-01-19 13:32:34 +00:00
dotnet-maestro[bot]
bd82fb0361 Update dependencies from https://github.com/dotnet/sdk build 20220118.26
Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.200-preview.22055.23 -> To Version 6.0.200-preview.22068.26

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.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks
 From Version 6.0.200-preview.21623.5 -> To Version 6.0.200-preview.22062.10 (parent: Microsoft.NET.Sdk
2022-01-19 08:30:11 +00:00
Marc Paine
41ae4ef8f2
Merge pull request #13036 from dotnet/marcpopMSFT-merge601xx
Update 6.0.2xx to current 6.0.102 changes
2022-01-18 09:39:40 -08:00
dotnet-maestro[bot]
8cd050c01b Update dependencies from https://github.com/dotnet/sdk build 20220117.4
Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.200-preview.22055.23 -> To Version 6.0.200-preview.22067.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.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks
 From Version 6.0.200-preview.21623.5 -> To Version 6.0.200-preview.22062.10 (parent: Microsoft.NET.Sdk
2022-01-18 04:57:27 +00:00
Alexander Köplinger
ee7e6073f4 Revert "Resolve msbuild source-build patch conflict"
This reverts commit 4b41693115.

We need the previous version after https://github.com/dotnet/sdk/pull/23421 was merged which downgraded msbuild back to the correct version.
2022-01-17 19:11:04 +01:00
dotnet-maestro[bot]
5ccd5f5fea Update dependencies from https://github.com/dotnet/sdk build 20220114.8
Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.200-preview.22055.23 -> To Version 6.0.200-preview.22064.8

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.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks
 From Version 6.0.200-preview.21623.5 -> To Version 6.0.200-preview.22062.10 (parent: Microsoft.NET.Sdk
2022-01-14 15:03:06 +00:00
dotnet-maestro[bot]
6a10fac9d3 Update dependencies from https://github.com/dotnet/sdk build 20220114.5
Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.200-preview.22055.23 -> To Version 6.0.200-preview.22064.5

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.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks
 From Version 6.0.200-preview.21623.5 -> To Version 6.0.200-preview.22062.10 (parent: Microsoft.NET.Sdk
2022-01-14 09:22:52 +00:00