Commit graph

22518 commits

Author SHA1 Message Date
Jason Zhai
2bd864a550 Merge branch 'release/6.0.2xx' of https://github.com/dotnet/installer into darc-release/6.0.2xx-c4c73741-470d-4e92-aabd-a4c047629eb4 2022-02-17 23:59:48 -08:00
dotnet-maestro[bot]
7581d57850 Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220217.5
Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 6.0.0-servicing.22110.1 -> To Version 6.0.0-servicing.22117.5
2022-02-18 06:04:10 +00:00
Jason Zhai
7160c3de98 Merge branch 'release/6.0.2xx' of https://github.com/dotnet/installer into darc-release/6.0.2xx-c4c73741-470d-4e92-aabd-a4c047629eb4 2022-02-17 21:58:31 -08:00
dotnet-maestro[bot]
332641837a Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220217.1
Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 6.0.0-servicing.22110.1 -> To Version 6.0.0-servicing.22117.1
2022-02-17 16:32:23 +00:00
Jason Zhai
ec79e28c68 Update NuGet.config 2022-02-16 01:47:06 -08:00
Marc Paine
2d6f118ce1
Merge pull request #13203 from vseanreesermsft/internal-merge-6.0.2xx-2022-02-08-1606
Merging internal commits for release/6.0.2xx
2022-02-15 16:26:27 -08:00
dotnet-maestro[bot]
e4b6870146 Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220215.1
Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 6.0.0-servicing.22110.1 -> To Version 6.0.0-servicing.22115.1
2022-02-15 15:59:20 +00:00
Marc Paine
eb482966af
Merge pull request #13199 from manodasanW/patch-4
[release/6.0.2xx] Windows SDK projection update
2022-02-11 13:47:56 -08:00
dotnet-maestro[bot]
1a8edd6415
[release/6.0.2xx] Update dependencies from dotnet/source-build-reference-packages (#13213)
[release/6.0.2xx] Update dependencies from dotnet/source-build-reference-packages


 - Update NuGet.config
2022-02-11 16:14:00 +00:00
Marc Paine
83352f6494
Merge pull request #13202 from dotnet/marcpopMSFT-servicingBranding
6.0.201 servicing branding
2022-02-10 13:15:02 -08:00
dotnet-maestro[bot]
080205a5d9
[release/6.0.2xx] Update dependencies from dotnet/arcade (#13188)
[release/6.0.2xx] Update dependencies from dotnet/arcade


 - Update NuGet.config
2022-02-09 15:16:14 +00:00
William Godbe
f13c273745
Update asp.net templates (#13194) 2022-02-08 16:30:48 -08:00
Sean Reeser
230eb5ce60 Merge commit '4c30de7899a11b05875df6d6a672d44d03789b5e' into internal-merge-6.0.2xx-2022-02-08-1606 2022-02-08 16:06:38 -08:00
Marc Paine
b2eed32257
Update Versions.props 2022-02-08 16:03:45 -08:00
Manodasan Wignarajah
ea4be9c1a7
[release/6.0.2xx] Windows SDK projection update 2022-02-08 13:15: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
4c30de7899 Merged PR 21052: Fix merge from public to internal
- Please add description for changes you are making.
- If there is an issue related to this PR, please add the reference.
2022-02-06 18:50:08 +00:00
Marc Paine
3faaf05d9f Merge remote-tracking branch 'ADO/release/6.0.2xx' into dev/marcpop/mergepublic 2022-02-06 10:48:16 -08:00
Marc Paine
9049a306f6
Update .vsts-ci.yml 2022-02-06 09:40:53 -08:00
Marc Paine
3c09f279cc Merged PR 21050: Switch to lowercase to match other cases.
- Please add description for changes you are making.
- If there is an issue related to this PR, please add the reference.

Switch to lowercase to match other cases.
2022-02-05 06:34:35 +00:00
Marc Paine
e0993bd73c Switch to lowercase to match other cases. 2022-02-05 06:33:35 +00:00
DotNet Bot
8a4636670a Merged PR 21043: [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.0 to 6.0.2 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.1-servicing.21568.2 to 6.0.2-servicing.22064.6 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.0-rtm.21523.1 to 6.0.2-servicing.22064.6 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Ref**: from 6.0.1 to 6.0.2 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.1-servicing.21567.5 to 6.0.2-servicing.22064.6 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.1 to 6.0.2 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.1 to 6.0.2 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.1 to 6.0.2 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref**: from 6.0.0 to 6.0.2 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.0-rtm.21526.8 to 6.0.2-servicing.22064.12 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.1 to 6.0.2 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.1-servicing.21567.14 to 6.0.2-servicing.22064.12 (parent: Microsoft.NET.Sdk)
  - **dotnet-dev-certs**: from 6.0.1-servicing.21567.14 to 6.0.2-servicing.22064.12 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-secrets**: from 6.0.1-servicing.21567.14 to 6.0.2-servicing.22064.12 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.200 to 6.0.200 (parent: Microsoft.NET.Sdk)
  - **Microsoft.TemplateEngine.Cli**: from 6.0.200-rtm.22071.1 to 6.0.200-rtm.22103.10 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.200 to 6.0.200 (parent: Microsoft.NET.Sdk)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.1 to 6.0.2 (parent: Microsoft.NET.Sdk)
  - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.1-servicing.21567.5 to 6.0.2-servicing.22064.7 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.1 to 6.0.2 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.1-servicing.21567.7 to 6.0.2-servicing.22064.8 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - **Microsoft.NET.ILLink.Tasks**: from 6.0.200-1.22103.1...
2022-02-05 05:04:43 +00:00
Marc Paine
738f121f8b Merge remote-tracking branch 'ADO/internal/release/6.0.2xx' into darc-internal/release/6.0.2xx-389814c1-2f80-453e-b83c-7ad00843a34c 2022-02-04 21:03:53 -08:00
dotnet-bot
0db1cf8a64 Merge in 'release/6.0.2xx' changes 2022-02-05 00:26:06 +00: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
2551ba7164 Merge remote-tracking branch 'ADO/internal/release/6.0.1xx' into darc-internal/release/6.0.2xx-389814c1-2f80-453e-b83c-7ad00843a34c 2022-02-04 15:32:31 -08:00
Marc Paine
6efd1da62e
Fix up implicit versions 2022-02-04 15:13:25 -08:00
DotNet-Bot
a56db4a33f Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220204.9
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.200-rtm.22103.35 -> To Version 6.0.200-rtm.22104.9

Dependency coherency updates

Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.6.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0,dotnet-dev-certs,dotnet-user-secrets,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,VS.Redist.Common.NetCore.SharedFramework.x64.6.0
 From Version 6.0.0 -> To Version 6.0.2 (parent: Microsoft.NET.Sdk
2022-02-04 22:48:34 +00:00
DotNet Bot
5a238f1427 Merged PR 21029: [internal/release/6.0.2xx] Update dependencies from dnceng/internal/dotnet-sdk
This pull request updates the following dependencies

[marker]: <> (Begin:b065b754-67d8-417c-0ef9-08d9d602f120)
## From https://github.com/dotnet/sdk
- **Subscription**: b065b754-67d8-417c-0ef9-08d9d602f120
- **Build**: 20220203.35
- **Date Produced**: February 4, 2022 6:54:19 AM UTC
- **Commit**: 82104d83fba7ad2710ba4526a645a6b1a490d331
- **Branch**: refs/heads/release/6.0.2xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.200-rtm.22103.4 to 6.0.200-rtm.22103.35][4]
  - **Microsoft.NET.Sdk**: [from 6.0.200-rtm.22103.4 to 6.0.200-rtm.22103.35][4]
  - **Microsoft.NET.ILLink.Tasks**: [from 6.0.200-1.22081.5 to 6.0.200-1.22103.1][5]

[4]: db23431...82104d8
[5]: cc3dc76...2b78c5e

[DependencyUpdate]: <> (End)

[marker]: <> (End:b065b754-67d8-417c-0ef9-08d9d602f120)

[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.NET.ILLink.Tasks**: from 6.0.200-1.22081.5 to 6.0.200-1.22103.1 (parent: Microsoft.NET.Sdk)

[DependencyUpdate]: <> (End)

[marker]: <> (End:Coherency Updates)
2022-02-04 21:15:42 +00:00
dotnet-bot
477d80b11b Merge in 'release/6.0.1xx' changes 2022-02-04 19:04:34 +00:00
Michael Simons
2842b74fd3
Refactor smoke-test to capture prereqs (#13145) 2022-02-04 12:52:30 -06:00
DotNet-Bot
681dc6348a Update dependencies from https://github.com/dotnet/sdk build 20220203.35
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.200-rtm.22103.4 -> To Version 6.0.200-rtm.22103.35

Dependency coherency updates

Microsoft.NET.ILLink.Tasks
 From Version 6.0.200-1.22081.5 -> To Version 6.0.200-1.22103.1 (parent: Microsoft.NET.Sdk
2022-02-04 07:23:58 +00:00
dotnet-bot
80261ffcd0 Merge in 'release/6.0.2xx' changes 2022-02-04 06:21:56 +00: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
DotNet-Bot
7f259cacfa Update dependencies from https://github.com/dotnet/sdk build 20220203.24
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.200-rtm.22103.4 -> To Version 6.0.200-rtm.22103.24

Dependency coherency updates

Microsoft.NET.ILLink.Tasks
 From Version 6.0.200-1.22081.5 -> To Version 6.0.200-1.22103.1 (parent: Microsoft.NET.Sdk
2022-02-03 22:58:08 +00:00
DotNet-Bot
71f3758b6d Update dependencies from https://github.com/dotnet/sdk build 20220203.21
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.200-rtm.22103.4 -> To Version 6.0.200-rtm.22103.21
2022-02-03 21:52:51 +00:00
DotNet Bot
5eb291854c Merged PR 20882: [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.NET.ILLink.Tasks**: from 6.0.200-1.22069.1 to 6.0.200-1.22081.5 (parent: Microsoft.NET.Sdk)
  - **Microsoft.Net.Compilers.Toolset**: from 4.1.0-3.22075.3 to 4.1.0-5.22102.1 (parent: Microsoft.NET.Sdk)

[DependencyUpdate]: <> (End)

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

[marker]: <> (Begin:b065b754-67d8-417c-0ef9-08d9d602f120)
## From https://github.com/dotnet/sdk
- **Subscription**: b065b754-67d8-417c-0ef9-08d9d602f120
- **Build**: 20220203.4
- **Date Produced**: February 3, 2022 4:47:52 PM UTC
- **Commit**: db234316ba6592d93da97a7cb1b95b2c2f74bd30
- **Branch**: refs/heads/release/6.0.2xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.200-rtm.22076.18 to 6.0.200-rtm.22103.4][11]
  - **Microsoft.NET.Sdk**: [from 6.0.200-rtm.22076.18 to 6.0.200-rtm.22103.4][11]
  - **Microsoft.NET.ILLink.Tasks**: [from 6.0.200-1.22069.1 to 6.0.200-1.22081.5][12]
  - **Microsoft.Net.Compilers.Toolset**: [from 4.1.0-3.22075.3 to 4.1.0-5.22102.1][13]

[11]: 8a705ab...db23431
[12]: 70dc7f6...cc3dc76
[13]: 592501c...f6b9551

[DependencyUpdate]: <> (End)

[marker]: <> (End:b065b754-67d8-417c-0ef9-08d9d602f120)
2022-02-03 21:47:03 +00: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
dotnet-bot
b39d25426d Merge in 'release/6.0.1xx' changes 2022-02-03 18:08:12 +00:00
dotnet-maestro[bot]
701b7698d6
Update dependencies from https://github.com/dotnet/arcade build 20220202.3 (#13164)
[release/6.0.1xx] Update dependencies from dotnet/arcade
2022-02-03 17:55:02 +00: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
DotNet-Bot
5cdd7f9c8e Update dependencies from https://github.com/dotnet/sdk build 20220203.4
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.200-rtm.22076.18 -> To Version 6.0.200-rtm.22103.4

Dependency coherency updates

Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset
 From Version 6.0.200-1.22069.1 -> To Version 6.0.200-1.22081.5 (parent: Microsoft.NET.Sdk
2022-02-03 17:10:09 +00: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-bot
51188061a8 Merge in 'release/6.0.1xx' changes 2022-02-03 16:55:55 +00: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]
a1c6314717
Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220203.1 (#13163)
Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 6.0.0-servicing.22078.1 -> To Version 6.0.0-servicing.22103.1

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
2022-02-03 08:42:57 -08:00