Commit graph

27139 commits

Author SHA1 Message Date
Sean Reeser
b72a2d6071 Merge commit '6c74320bc3ea80d03493a069e4c424b19a5a1983' into internal-merge-7.0.2xx-2023-03-14-1018 2023-03-14 10:18:09 -07:00
Marc Paine
7ca349a7d4
[automated] Merge branch 'release/7.0.1xx' => 'release/7.0.2xx' (#15731) 2023-03-09 13:18:15 -08:00
Marc Paine
b16f378013
[release/7.0.2xx] Update dependencies from dotnet/arcade (#15610) 2023-03-09 13:17:19 -08:00
Jason Zhai
5b6fe1117a Merge branch 'release/7.0.1xx' into release/7.0.2xx 2023-03-07 18:51:58 -08:00
Marc Paine
e47e22aac6
[automated] Merge branch 'release/7.0.1xx' => 'release/7.0.2xx' (#15576) 2023-03-07 16:54:54 -08:00
Marc Paine
3a17ee2e6f
Update branding to 7.0.105 (#15721) 2023-03-07 16:53:18 -08:00
Marc Paine
34c43ac42d
Update branding to 7.0.203 (#15722) 2023-03-07 11:45:02 -08:00
William Godbe
bb91038a82
Update branding to 7.0.203 2023-03-07 10:22:58 -08:00
Will Godbe
4714d8cdf6 Update branding to 7.0.105 2023-03-07 10:11:46 -08:00
Chris Rummel
a4ecf7bfc0
Update poison usage baseline. (#15688) 2023-03-03 08:55:03 -06:00
Nikola Milosavljevic
c964d85026
[release/7.0.1xx] SDK diff exclusions - backport (#15670) 2023-03-01 11:05:57 -06:00
DotNet Bot
6c74320bc3 Merged PR 29823: [internal/release/7.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.Compilers.Toolset**: from 4.5.0-6.23123.11 to 4.5.0-6.23127.3 (parent: Microsoft.NET.Sdk)
  - **Microsoft.Build**: from 17.5.0 to 17.5.0 (parent: Microsoft.NET.Sdk)

[DependencyUpdate]: <> (End)

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

[marker]: <> (Begin:2dd28bf7-20bb-4672-1875-08daed76fd91)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- **Subscription**: 2dd28bf7-20bb-4672-1875-08daed76fd91
- **Build**: 20230228.1
- **Date Produced**: February 28, 2023 10:36:52 AM UTC
- **Commit**: 288f1065b0d882689bdbee4a91ceb34617fc9f96
- **Branch**: refs/heads/internal/release/7.0.2xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.202 to 7.0.202][6]
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.202-servicing.23127.10 to 7.0.202-servicing.23128.1][6]
  - **Microsoft.NET.Sdk**: [from 7.0.202-servicing.23127.10 to 7.0.202-servicing.23128.1][6]
  - **Microsoft.TemplateEngine.Cli**: [from 7.0.202-servicing.23127.10 to 7.0.202-servicing.23128.1][6]
  - **Microsoft.Net.Compilers.Toolset**: [from 4.5.0-6.23123.11 to 4.5.0-6.23127.3][7]
  - **Microsoft.Build**: [from 17.5.0 to 17.5.0][8]

[6]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC19d897b&targetVersion=GC288f106&_a=files
[7]: 271ccd7...e2bc27d
[8]: 8ce3029...6f08c67

[DependencyUpdate]: <> (End)

[marker]: <> (End:2dd28bf7-20bb-4672-1875-08daed76fd91)
2023-02-28 15:54:28 +00:00
DotNet Bot
8a516d2a80 Merged PR 29817: [internal/release/7.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.Compilers.Toolset**: from 4.5.0-6.23109.5 to 4.5.0-6.23123.11 (parent: Microsoft.NET.Sdk)
  - **Microsoft.Build**: from 17.5.0 to 17.5.0 (parent: Microsoft.NET.Sdk)

[DependencyUpdate]: <> (End)

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

[marker]: <> (Begin:2dd28bf7-20bb-4672-1875-08daed76fd91)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- **Subscription**: 2dd28bf7-20bb-4672-1875-08daed76fd91
- **Build**: 20230227.10
- **Date Produced**: February 27, 2023 7:35:58 PM UTC
- **Commit**: 19d897be95902ca23a704f58d2fa7adf5b13106c
- **Branch**: refs/heads/internal/release/7.0.2xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.201 to 7.0.202][3]
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.201-rtm.23120.7 to 7.0.202-servicing.23127.10][3]
  - **Microsoft.NET.Sdk**: [from 7.0.201-rtm.23120.7 to 7.0.202-servicing.23127.10][3]
  - **Microsoft.TemplateEngine.Cli**: [from 7.0.201-rtm.23120.7 to 7.0.202-servicing.23127.10][3]
  - **Microsoft.Net.Compilers.Toolset**: [from 4.5.0-6.23109.5 to 4.5.0-6.23123.11][4]
  - **Microsoft.Build**: [from 17.5.0 to 17.5.0][5]

[3]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC1ce1f1e&targetVersion=GC19d897b&_a=files
[4]: 6a5a63b...271ccd7
[5]: 81ac935...8ce3029

[DependencyUpdate]: <> (End)

[marker]: <> (End:2dd28bf7-20bb-4672-1875-08daed76fd91)
2023-02-27 22:25:05 +00:00
dotnet-bot
b9926d6812 Merge in 'release/7.0.2xx' changes 2023-02-27 17:23:41 +00:00
Marc Paine
7d72c5a676
Increase branding version and downgrade implicit version to enable hotfix release (#15587) 2023-02-27 09:13:26 -08:00
dotnet-maestro[bot]
63512f7023 Update dependencies from https://github.com/dotnet/arcade build 20230222.4
Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk
 From Version 7.0.0-beta.23114.3 -> To Version 7.0.0-beta.23122.4
2023-02-23 22:26:55 +00:00
Omair Majid
df0fc12896
Add Alpine CI for source-build (#14417)
Co-authored-by: Michael Simons <msimons@microsoft.com>
2023-02-22 12:51:32 -06:00
dotnet-maestro[bot]
f868f35234 Update dependencies from https://github.com/dotnet/arcade build 20230217.3
Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk
 From Version 7.0.0-beta.23114.3 -> To Version 7.0.0-beta.23117.3
2023-02-22 17:11:35 +00:00
Tom Deseyn
9a9449b598
tests: ExecuteRunWeb: update expected SIGTERM exit code on mono. (#15341)
Co-authored-by: Michael Simons <msimons@microsoft.com>
2023-02-22 09:52:28 -06:00
DotNet Bot
4946228186 Merged PR 29723: [internal/release/7.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 7.0.3 to 7.0.4 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0**: from 7.0.3-servicing.23073.3 to 7.0.4-servicing.23118.3 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0**: from 7.0.3-servicing.23073.3 to 7.0.4-servicing.23118.3 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Ref**: from 7.0.3 to 7.0.4 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.NetCore.TargetingPack.x64.7.0**: from 7.0.3-servicing.23069.10 to 7.0.4-servicing.23115.8 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Runtime.win-x64**: from 7.0.3 to 7.0.4 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Host.win-x64**: from 7.0.3 to 7.0.4 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.DotNetHostResolver**: from 7.0.3 to 7.0.4 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.Platforms**: from 7.0.0 to 7.0.1 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref**: from 7.0.3 to 7.0.4 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref.Internal**: from 7.0.3-servicing.23080.9 to 7.0.4-servicing.23119.3 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 7.0.3 to 7.0.4 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0**: from 7.0.3-servicing.23080.9 to 7.0.4-servicing.23119.3 (parent: Microsoft.NET.Sdk)
  - **dotnet-dev-certs**: from 7.0.3-servicing.23080.9 to 7.0.4-servicing.23119.3 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-jwts**: from 7.0.3-servicing.23080.9 to 7.0.4-servicing.23119.3 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-secrets**: from 7.0.3-servicing.23080.9 to 7.0.4-servicing.23119.3 (parent: Microsoft.NET.Sdk)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 7.0.3 to 7.0.4 (parent: Microsoft.NET.Sdk)
  - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 7.0.3-servicing.23072.1 to 7.0.4-servicing.23117.7 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 7.0.3 to 7.0.4 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 7.0.3-servicing.23073.1 to 7.0.4-servicing.23117.7 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - **Microsoft.Net.Compilers.Toolset**: from 4.5.0-3.23070.7 to 4.5.0-6.23109.5 (parent: Microsoft.NET.Sdk)
  - **Microsoft.Build**: from 17.5.0-preview-23061-01 to 17.5.0 (par...
2023-02-21 20:55:43 +00:00
Jason Zhai
ab517a4292 Merge branch 'release/7.0.1xx' into release/7.0.2xx 2023-02-19 22:29:21 -08:00
Marc Paine
15e62a00f4
[automated] Merge branch 'release/6.0.4xx' => 'release/7.0.1xx' (#15575) 2023-02-17 15:23:15 -08:00
Jason Zhai
a405240f2b Merge branch 'release/6.0.4xx' into release/7.0.1xx 2023-02-16 18:38:41 -08:00
Chris Rummel
c32738ee77
.NET Source-Build 7.0.103 February 2023 Updates (#15561) 2023-02-16 17:26:44 -06:00
Marc Paine
f6b20985e8
[automated] Merge branch 'release/6.0.3xx' => 'release/6.0.4xx' (#15573) 2023-02-16 14:27:53 -08:00
dotnet-bot
170c6c4dba Merge in 'release/7.0.2xx' changes 2023-02-16 18:45:38 +00:00
Marc Paine
8442e63077
Merge branch 'release/6.0.4xx' into merge/release/6.0.3xx-to-release/6.0.4xx 2023-02-16 10:41:47 -08:00
Marc Paine
28b9b6be7f
[automated] Merge branch 'release/6.0.1xx' => 'release/6.0.3xx' (#15539) 2023-02-16 10:36:24 -08:00
dotnet-maestro[bot]
aca89f19d0
[release/7.0.2xx] Update dependencies from dotnet/test-templates (#15567)
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
2023-02-16 10:34:28 -08:00
dotnet-maestro[bot]
d5dd89bb88
[release/7.0.1xx] Update dependencies from dotnet/arcade (#15559)
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
2023-02-16 07:54:43 -08:00
dotnet-maestro[bot]
42aca7c867
[release/6.0.4xx] Update dependencies from dotnet/arcade (#15562)
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
2023-02-16 07:53:22 -08:00
dotnet-bot
c13a39ea98 Merge in 'release/7.0.2xx' changes 2023-02-15 19:18:28 +00:00
dotnet-maestro[bot]
7baf416472
[release/7.0.2xx] Update dependencies from dotnet/arcade (#15557)
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
2023-02-15 11:06:49 -08:00
Jason Zhai
f678538cf6 Merge branch 'release/6.0.1xx' into release/6.0.3xx 2023-02-14 22:47:37 -08:00
dotnet-bot
56f2264c8d Merge in 'release/7.0.2xx' changes 2023-02-15 01:48:23 +00:00
Doug Bunting
6d3cb5a4f9
[release/7.0.1xx] Bump ASP.NET template versions (#15548) 2023-02-14 17:37:20 -08:00
Doug Bunting
bbcbae4320
[release/7.0.2xx] Bump ASP.NET template versions (#15547) 2023-02-14 17:36:39 -08:00
Doug Bunting
b1d131603a
[release/6.0.3xx] Bump missed ASP.NET template version (#15550) 2023-02-14 17:35:48 -08:00
Doug Bunting
45d5d425f7
[release/6.0.4xx] Bump missed ASP.NET template version (#15549) 2023-02-14 17:35:45 -08:00
dotnet-bot
9c0803697e Merge in 'release/7.0.2xx' changes 2023-02-14 22:07:01 +00:00
vseanreesermsft
3cc0821abb
Merging internal commits for release/7.0.2xx (#15537)
Co-authored-by: DotNet Bot <dn-bot@microsoft.com>
Co-authored-by: Matt Mitchell <mmitche@microsoft.com>
2023-02-14 13:55:20 -08:00
vseanreesermsft
1fcdbe277d
Merging internal commits for release/7.0.1xx (#15536)
Co-authored-by: dotnet-bot <dotnet-bot@microsoft.com>
Co-authored-by: DotNet-Bot <dn-bot@microsoft.com>
Co-authored-by: Chris Rummel <crummel@microsoft.com>
Co-authored-by: Marc Paine <marcpop@microsoft.com>
2023-02-14 13:55:02 -08:00
vseanreesermsft
3e9dc15889
Merging internal commits for release/6.0.4xx (#15535)
Co-authored-by: dotnet-bot <dotnet-bot@microsoft.com>
Co-authored-by: DotNet-Bot <dn-bot@microsoft.com>
Co-authored-by: Matt Mitchell <mmitche@microsoft.com>
2023-02-14 13:53:14 -08:00
vseanreesermsft
0fdf746d87
Merging internal commits for release/6.0.3xx (#15534)
Co-authored-by: DotNet-Bot <dn-bot@microsoft.com>
Co-authored-by: dotnet-bot <dotnet-bot@microsoft.com>
2023-02-14 13:52:06 -08:00
vseanreesermsft
f66604ee7a
Merging internal commits for release/6.0.1xx (#15533)
Co-authored-by: dotnet-bot <dotnet-bot@microsoft.com>
Co-authored-by: DotNet-Bot <dn-bot@microsoft.com>
Co-authored-by: Matt Mitchell <mmitche@microsoft.com>
Co-authored-by: Marc Paine <marcpop@microsoft.com>
2023-02-14 13:51:20 -08:00
dotnet-maestro-bot
11315562cf
[automated] Merge branch 'release/7.0.1xx' => 'release/7.0.2xx' (#15472)
Co-authored-by: Michael Simons <msimons@microsoft.com>
Co-authored-by: Logan Bussell <loganbussell@microsoft.com>
Co-authored-by: Chris Rummel <crummel@microsoft.com>
Co-authored-by: vseanreesermsft <78103370+vseanreesermsft@users.noreply.github.com>
Co-authored-by: dotnet-bot <dotnet-bot@microsoft.com>
Co-authored-by: Matt Mitchell <mmitche@microsoft.com>
Co-authored-by: DotNet-Bot <dn-bot@microsoft.com>
Co-authored-by: Sean Reeser <v-seanreeser@microsoft.com>
Co-authored-by: Marc Paine <marcpop@microsoft.com>
Co-authored-by: William Godbe <wigodbe@microsoft.com>
Co-authored-by: Jason Zhai <v-wuzhai@microsoft.com>
Co-authored-by: v-wuzhai <46013274+v-wuzhai@users.noreply.github.com>
Co-authored-by: NET Source-Build Bot <102560831+dotnet-sb-bot@users.noreply.github.com>
Co-authored-by: Matt Thalman <mthalman@microsoft.com>
Co-authored-by: dotnet-maestro[bot] <42748379+dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Daniel Plaisted <dsplaisted@gmail.com>
2023-02-10 15:57:40 -08:00
Matt Mitchell
e2c796b8c1
[release/7.0.2xx] Update checksum generation order (#15397) (#15482)
Co-authored-by: Michael Simons <msimons@microsoft.com>
2023-02-09 16:08:19 -08:00
Matt Mitchell
0709aa684b
[release/7.0.1xx] Update checksum generation order (#15397) (#15481)
Co-authored-by: Michael Simons <msimons@microsoft.com>
2023-02-09 16:08:09 -08:00
dotnet-maestro[bot]
83d785ccfb
[release/7.0.2xx] Update dependencies from dotnet/arcade (#15332)
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Jason Zhai <v-wuzhai@microsoft.com>
2023-02-09 13:35:31 -08:00
dotnet-maestro-bot
8b9ae41652
[automated] Merge branch 'release/6.0.3xx' => 'release/6.0.4xx' (#15473)
Co-authored-by: Sean Reeser <v-seanreeser@microsoft.com>
Co-authored-by: Daniel Plaisted <daplaist@microsoft.com>
Co-authored-by: Chris Rummel <crummel@microsoft.com>
Co-authored-by: vseanreesermsft <78103370+vseanreesermsft@users.noreply.github.com>
Co-authored-by: Marc Paine <marcpop@microsoft.com>
Co-authored-by: Jason Zhai <v-wuzhai@microsoft.com>
2023-02-08 14:21:49 -08:00