Commit graph

26538 commits

Author SHA1 Message Date
dotnet-maestro-bot
753a4009a5
[automated] Merge branch 'release/6.0.3xx' => 'release/6.0.4xx' (#14911)
* Refactor source-build CI triggers and pools (#14835) (#14878)

* Update triggers to prevent tarball CI from running on 6.0.3xx and 6.0.4xx (#14896)

Co-authored-by: Michael Simons <msimons@microsoft.com>
Co-authored-by: v-wuzhai <46013274+v-wuzhai@users.noreply.github.com>
Co-authored-by: Jason Zhai <v-wuzhai@microsoft.com>
2022-11-08 08:35:11 -06:00
v-wuzhai
48fb4b6442
Merge pull request #14895 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-11-08 09:48:23 +08:00
Michael Simons
d454057851
Merge branch 'release/6.0.3xx' into merge/release/6.0.1xx-to-release/6.0.3xx 2022-11-07 17:18:24 -06:00
Michael Simons
e58b4b582e
Update triggers to prevent tarball CI from running on 6.0.3xx and 6.0.4xx (#14896) 2022-11-07 17:16:37 -06:00
Marc Paine
fdd0b18d83
Merge branch 'release/7.0.1xx' into marcpopMSFT-fixtelemetrytestversion 2022-11-06 20:44:09 -08:00
dotnet-bot
a23591fe4c Merge in 'release/7.0.1xx' changes 2022-11-07 02:33:38 +00:00
v-wuzhai
d7cafddd86
Merge pull request #14891 from dotnet-maestro-bot/merge/release/6.0.4xx-to-release/7.0.1xx
[automated] Merge branch 'release/6.0.4xx' => 'release/7.0.1xx'
2022-11-06 18:22:25 -08:00
Marc Paine
ccd4c9b0e2 Fix build error. 2022-11-05 15:13:09 -07:00
Marc Paine
89758ef046 Get the telemetry version from the --version command and use it to find dotnet.dll 2022-11-04 22:55:00 -07:00
Marc Paine
6e5661babc
Quick fix to unblock codeflow while I investigate further 2022-11-04 16:50:32 -07:00
Michael Simons
081ee69e53
Refactor source-build CI triggers and pools (#14835) (#14878) 2022-11-04 12:04:36 -05:00
Jason Zhai
8f3c970895 Merge branch 'release/6.0.4xx' into release/7.0.1xx 2022-11-04 01:08:53 -07:00
Marc Paine
72553f8783
Merge pull request #14889 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-11-03 22:51:23 -07:00
Marc Paine
7ad7e5f37f
Merge pull request #14836 from joeloff/finalizer2
Ensure finalizer only runs when no matching SDK feature bands are installed
2022-11-03 15:51:28 -07:00
Marc Paine
15aec658a5
Merge branch 'release/6.0.4xx' into merge/release/6.0.3xx-to-release/6.0.4xx 2022-11-03 13:22:52 -07:00
Marc Paine
05ccc0e989
Merge pull request #14876 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-11-03 11:08:03 -07:00
v-wuzhai
8f60659f0a
Merge pull request #14874 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-11-02 22:27:54 -07:00
Jason Zhai
f3f7fb6c5d Merge branch 'release/6.0.1xx' into release/6.0.3xx 2022-11-02 22:26:15 -07:00
Marc Paine
2db6be3b19
Merge pull request #14830 from dotnet/marcpopMSFT-codeql
Enable codeql
2022-11-02 10:21:22 -07:00
Marc Paine
3b90baa8fe
Merge pull request #14829 from dotnet/marcpopMSFT-final3.1build
Fix to final 3.1 build
2022-11-02 10:21:14 -07:00
v-wuzhai
b1cf660853
Merge pull request #14869 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-11-02 02:35:38 -07:00
v-wuzhai
25f95ab488
Merge pull request #14872 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-11-02 02:35:11 -07:00
Jason Zhai
222fcbdbbe Merge branch 'release/6.0.3xx' into release/6.0.4xx 2022-11-01 23:05:21 -07:00
Jason Zhai
62d4355934 Merge branch 'release/6.0.1xx' into release/6.0.3xx 2022-11-01 22:45:14 -07:00
DotNet Bot
7b91da9144 Merged PR 27044: [internal/release/7.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk
This pull request updates the following dependencies

[marker]: <> (Begin:65272799-fe4d-4dbf-f0fe-08da7ef63651)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- **Subscription**: 65272799-fe4d-4dbf-f0fe-08da7ef63651
- **Build**: 20221025.10
- **Date Produced**: October 26, 2022 4:35:49 AM UTC
- **Commit**: 86457a8ee126653ca38a5330a68e380a1da158e8
- **Branch**: refs/heads/internal/release/7.0.1xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.100 to 7.0.100][1]
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.100-rtm.22521.7 to 7.0.100-rtm.22525.10][1]
  - **Microsoft.NET.Sdk**: [from 7.0.100-rtm.22521.7 to 7.0.100-rtm.22525.10][1]
  - **Microsoft.TemplateEngine.Cli**: [from 7.0.100-rtm.22521.7 to 7.0.100-rtm.22525.10][1]

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

[DependencyUpdate]: <> (End)

[marker]: <> (End:65272799-fe4d-4dbf-f0fe-08da7ef63651)
2022-11-01 23:41:17 +00:00
dotnet-bot
4b14efe768 Merge in 'release/7.0.1xx' changes 2022-11-01 23:12:56 +00:00
Marc Paine
973f1e7ffa
Merge pull request #14865 from vseanreesermsft/branding-6.0.112-2022-11-01-1417
Update branding to 6.0.112
2022-11-01 16:08:36 -07:00
Marc Paine
b110fd5fe9
Merge pull request #14693 from dotnet/marcpopMSFT-addtelemetrytest
Add a prototype telemetry setting test.
2022-11-01 16:02:18 -07:00
Marc Paine
45c95da80c
Merge pull request #14867 from vseanreesermsft/branding-6.0.404-2022-11-01-1417
Update branding to 6.0.404
2022-11-01 15:32:42 -07:00
Marc Paine
2a488056d0
Merge pull request #14866 from vseanreesermsft/branding-6.0.307-2022-11-01-1417
Update branding to 6.0.307
2022-11-01 15:32:31 -07:00
dotnet-bot
d56449ffa4 Merge in 'release/7.0.1xx' changes 2022-11-01 22:05:59 +00:00
Marc Paine
6924418fc8
Merge pull request #14838 from vseanreesermsft/branding-7.0.101-2022-10-27-0951
Update branding to 7.0.101
2022-11-01 14:55:45 -07:00
Sean Reeser
c7fe18c3f8 Update branding to 6.0.404 2022-11-01 14:17:48 -07:00
Sean Reeser
8ffa10fe47 Update branding to 6.0.307 2022-11-01 14:17:44 -07:00
Sean Reeser
55ad445024 Update branding to 6.0.112 2022-11-01 14:17:40 -07:00
Marc Paine
3f43116264
Update Versions.props 2022-11-01 10:24:46 -07:00
dotnet-bot
7fdf4794ae Merge in 'release/7.0.1xx' changes 2022-10-31 14:21:14 +00:00
Logan Bussell
3079e52002
[release/7.0.1xx] Increase dotnet-watch source-build smoke test timeout (#14842)
* Up timeout for dotnet-watch smoke test

* Add more descriptive timeout message
2022-10-31 09:10:33 -05:00
dotnet-bot
8a7526cfe0 Merge in 'release/7.0.1xx' changes 2022-10-27 18:59:38 +00:00
Michael Simons
bf9d4a0e2c
Refactor source-build CI triggers and pools (#14835) 2022-10-27 13:48:47 -05:00
Sean Reeser
e1910d8fe0 Update branding to 7.0.101 2022-10-27 09:51:43 -07:00
Jacques Eloff
319ac0113e Ensure finalizer only runs when no matching SDK feature bands are installed 2022-10-26 21:24:13 -07:00
DotNet-Bot
6d7d4ef5f3 Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20221025.10
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 7.0.100 -> To Version 7.0.100
2022-10-26 05:01:22 +00:00
Marc Paine
55f53174fe
Enable codeql 2022-10-25 14:32:46 -07:00
Marc Paine
306e6009b3
Fix to final 3.1 build 2022-10-25 10:58:48 -07:00
Marc Paine
4f0837a5ef Remove prior verison of test. 2022-10-25 10:55:35 -07:00
Marc Paine
1138045cdd
Update TelemetryOptOutDefaultTests.cs 2022-10-24 15:48:03 -07:00
DotNet Bot
583adf944c [internal/release/6.0.3xx] Update dependencies from dnceng/internal/dotnet-sdk
- Coherency Updates:
  - Microsoft.WindowsDesktop.App.Ref: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0: from 6.0.11-servicing.22519.3 to 6.0.11-servicing.22523.3 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0: from 6.0.11-servicing.22519.3 to 6.0.11-servicing.22523.3 (parent: Microsoft.NET.Sdk)
  - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk)
  - Microsoft.Dotnet.WinForms.ProjectTemplates: from 6.0.11-servicing.22519.5 to 6.0.11-servicing.22523.4 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk)
  - Microsoft.DotNet.Wpf.ProjectTemplates: from 6.0.11-servicing.22519.2 to 6.0.11-servicing.22523.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
2022-10-24 15:32:49 +00:00
DotNet Bot
2bc18bf292 Merged PR 27009: [internal/release/6.0.4xx] 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.11 to 6.0.11 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.11-servicing.22519.3 to 6.0.11-servicing.22523.3 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.11-servicing.22519.3 to 6.0.11-servicing.22523.3 (parent: Microsoft.NET.Sdk)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk)
  - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.11-servicing.22519.5 to 6.0.11-servicing.22523.4 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.11-servicing.22519.2 to 6.0.11-servicing.22523.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)

[DependencyUpdate]: <> (End)

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

[marker]: <> (Begin:a27c2ce2-aedf-42b7-d31e-08da6571bd31)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- **Subscription**: a27c2ce2-aedf-42b7-d31e-08da6571bd31
- **Build**: 20221023.23
- **Date Produced**: October 24, 2022 4:34:27 AM UTC
- **Commit**: 6b1e4bc5f9ae0c720255a6accb3fd6654ebe9385
- **Branch**: refs/heads/internal/release/6.0.4xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.403-servicing.22523.16 to 6.0.403-servicing.22523.23][1]
  - **Microsoft.NET.Sdk**: [from 6.0.403-servicing.22523.16 to 6.0.403-servicing.22523.23][1]
  - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.11 to 6.0.11][2]
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.11-servicing.22519.3 to 6.0.11-servicing.22523.3][2]
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: [from 6.0.11-servicing.22519.3 to 6.0.11-servicing.22523.3][2]
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.11 to 6.0.11][2]
  - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.11-servicing.22519.5 to 6.0.11-servicing.22523.4][3]
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.11 to 6.0.11][2]
  - **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 6.0.11-servicing.22519.2 to 6.0.11-servicing.22523.2][4]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCca02a95&targetVersion=GC6b1e4bc&_a=files
[2]: https://dev...
2022-10-24 15:32:23 +00:00
DotNet Bot
fb958f0c78 Merged PR 27002: [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.AspNetCore.App.Ref**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.11-servicing.22518.17 to 6.0.11-servicing.22523.4 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.11-servicing.22518.17 to 6.0.11-servicing.22523.4 (parent: Microsoft.NET.Sdk)
  - **dotnet-dev-certs**: from 6.0.11-servicing.22518.17 to 6.0.11-servicing.22523.4 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-secrets**: from 6.0.11-servicing.22518.17 to 6.0.11-servicing.22523.4 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.306 to 6.0.306 (parent: Microsoft.NET.Sdk)
  - **Microsoft.TemplateEngine.Cli**: from 6.0.306-servicing.22519.11 to 6.0.306-servicing.22523.5 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.306 to 6.0.306 (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**: 20221023.15
- **Date Produced**: October 24, 2022 3:27:24 AM UTC
- **Commit**: eeb998091f4302f58f636f1c75ee5150d5b940c1
- **Branch**: refs/heads/internal/release/6.0.3xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.306-servicing.22523.5 to 6.0.306-servicing.22523.15][1]
  - **Microsoft.NET.Sdk**: [from 6.0.306-servicing.22523.5 to 6.0.306-servicing.22523.15][1]
  - **Microsoft.AspNetCore.App.Ref**: [from 6.0.11 to 6.0.11][2]
  - **Microsoft.AspNetCore.App.Ref.Internal**: [from 6.0.11-servicing.22518.17 to 6.0.11-servicing.22523.4][2]
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 6.0.11 to 6.0.11][2]
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: [from 6.0.11-servicing.22518.17 to 6.0.11-servicing.22523.4][2]
  - **dotnet-dev-certs**: [from 6.0.11-servicing.22518.17 to 6.0.11-servicing.22523.4][2]
  - **dotnet-user-secrets**: [from 6.0.11-servicing.22518.17 to 6.0.11-servicing.22523.4][2]
  - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.306 to 6.0.306][3]
  - **Microsoft.TemplateEngine.Cli**: [from 6.0.306-servicing.22519.11 to 6.0.306-servicing.22523.5][3]
  - ...
2022-10-24 03:58:27 +00:00