Commit graph

23698 commits

Author SHA1 Message Date
Marc Paine
58c897f829
[automated] Merge branch 'release/6.0.1xx' => 'release/6.0.3xx' (#15583) 2023-03-07 16:54:10 -08:00
Marc Paine
77f9b7a7bd
Update branding to 6.0.311 (#15719) 2023-03-07 11:42:19 -08:00
Will Godbe
7f856954d3 Update branding to 6.0.311 2023-03-07 10:11:35 -08:00
Jason Zhai
f707b71546 Merge branch 'release/6.0.1xx' into release/6.0.3xx 2023-02-19 22:23:44 -08:00
Chris Rummel
914b24dcdd
.NET Source-Build 6.0.114 February 2023 Updates (#15560) 2023-02-17 10:28:43 -06: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]
32fca6aa85
[release/6.0.1xx] Update dependencies from dotnet/arcade (#15563)
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
2023-02-16 07:53:06 -08:00
Doug Bunting
5c0c4649b2
[release/6.0.1xx] Bump missed ASP.NET template version (#15551) 2023-02-15 08:55:43 -08:00
Jason Zhai
f678538cf6 Merge branch 'release/6.0.1xx' into release/6.0.3xx 2023-02-14 22:47:37 -08:00
Doug Bunting
b1d131603a
[release/6.0.3xx] Bump missed ASP.NET template version (#15550) 2023-02-14 17:35:48 -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
f0a9fa30d3
[automated] Merge branch 'release/6.0.1xx' => 'release/6.0.3xx' (#15458)
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>
2023-02-07 23:53:26 +00:00
vseanreesermsft
b278e8143e
Update branding to 6.0.115 (#15459) 2023-02-07 13:57:45 -08:00
Daniel Plaisted
fe7b9cc6b1
Update branding to 6.0.310 (#15460) 2023-02-07 15:58:15 -05:00
Sean Reeser
ccc4b086fc Update branding to 6.0.310 2023-02-07 11:41:50 -08:00
Chris Rummel
1a3d1b916d
[release/6.0] Disable secure supply chain check. (#15412) 2023-02-07 13:23:50 -06:00
Chris Rummel
41a85aa01d
Disable secure supply chain check.
These issues are checked for in the individual repos - by the time source-build is building the tarball they have already been processed and approved.
2023-02-02 13:06:10 -06:00
Marc Paine
4512754d90
[automated] Merge branch 'release/6.0.1xx' => 'release/6.0.3xx' (#15259) 2023-01-12 13:39:42 -08:00
Jason Zhai
0185d3b525 Merge branch 'release/6.0.1xx' into release/6.0.3xx 2023-01-11 22:13:38 -08:00
dotnet-maestro[bot]
cc5bd785a2
[release/6.0.1xx] Update dependencies from dotnet/arcade (#15263)
[release/6.0.1xx] Update dependencies from dotnet/arcade
2023-01-11 22:23:56 +00:00
Matt Thalman
d625ce4fb0
Disable CheckEolTargetFramework for all projects (#15222) 2023-01-11 15:34:43 -06:00
NET Source-Build Bot
b6ccfab5b7
.NET Source-Build 6.0.113 January 2023 Updates (#15250) 2023-01-11 08:38:11 -06:00
v-wuzhai
19d43e55fa
[automated] Merge branch 'release/6.0.1xx' => 'release/6.0.3xx' (#15255) 2023-01-11 02:01:01 -08:00
Jason Zhai
f1e40685e0 Merge branch 'release/6.0.1xx' into release/6.0.3xx 2023-01-10 22:44:36 -08:00
William Godbe
8429945e1c
[6.0.1xx] Update Asp.Net templates (#15245) 2023-01-10 15:49:09 -08:00
William Godbe
ba627450f8
[6.0.3xx] Update Asp.Net templates (#15246) 2023-01-10 15:42:58 -08:00
Marc Paine
40cd09ee52
Merging internal commits for release/6.0.3xx (#15237) 2023-01-10 13:27:31 -08:00
Marc Paine
621ea8be96
Merging internal commits for release/6.0.1xx (#15236) 2023-01-10 13:26:08 -08:00
Sean Reeser
d2ec709d0d Merge commit 'c61979521a4c6136fac9fa4d60f227c7971c6042' into internal-merge-6.0.3xx-2023-01-10-1107 2023-01-10 11:07:58 -08:00
Sean Reeser
00b815772f Merge commit '4a23b50f9783e31c496e8c21b8f117351feea870' into internal-merge-6.0.1xx-2023-01-10-1107 2023-01-10 11:07:50 -08:00
Marc Paine
4e696ddab9
Update branding to 6.0.114 (#15181) 2023-01-03 16:47:35 -08:00
Marc Paine
3ceafae5c5
Update branding to 6.0.309 (#15182) 2023-01-03 15:49:15 -08:00
Sean Reeser
b36e17c794 Update branding to 6.0.309 2023-01-03 15:11:47 -08:00
Sean Reeser
c39a914ecc Update branding to 6.0.114 2023-01-03 15:11:42 -08:00
v-wuzhai
79613fc28a
[automated] Merge branch 'release/6.0.1xx' => 'release/6.0.3xx' (#15154) 2022-12-20 01:29:00 -08:00
Jason Zhai
704c2ea593 Merge branch 'release/6.0.1xx' into release/6.0.3xx 2022-12-19 23:31:58 -08:00
NET Source-Build Bot
5174d50e4e
.NET Source-Build 6.0.112 December 2022 Updates (#15127) 2022-12-19 17:20:19 -08:00
DotNet Bot
c61979521a Merged PR 28083: [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.WindowsDesktop.App.Ref**: from 6.0.13 to 6.0.13 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.13-servicing.22601.1 to 6.0.13-servicing.22601.6 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.13-servicing.22601.1 to 6.0.13-servicing.22601.6 (parent: Microsoft.NET.Sdk)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.13 to 6.0.13 (parent: Microsoft.NET.Sdk)
  - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.13-servicing.22579.11 to 6.0.13-servicing.22601.1 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.13 to 6.0.13 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.13-servicing.22580.2 to 6.0.13-servicing.22601.5 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)

[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**: 20221201.36
- **Date Produced**: December 2, 2022 12:32:31 AM UTC
- **Commit**: 873cc1a88b27554f9f12d378b91861fc4b82ee56
- **Branch**: refs/heads/internal/release/6.0.3xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.308-servicing.22601.16 to 6.0.308-servicing.22601.36][1]
  - **Microsoft.NET.Sdk**: [from 6.0.308-servicing.22601.16 to 6.0.308-servicing.22601.36][1]
  - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.13 to 6.0.13][2]
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.13-servicing.22601.1 to 6.0.13-servicing.22601.6][2]
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: [from 6.0.13-servicing.22601.1 to 6.0.13-servicing.22601.6][2]
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.13 to 6.0.13][2]
  - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.13-servicing.22579.11 to 6.0.13-servicing.22601.1][3]
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.13 to 6.0.13][2]
  - **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 6.0.13-servicing.22580.2 to 6.0.13-servicing.22601.5][4]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCe6ee3f4&targetVersion=GC873cc1a&_a=files
[2]: https://...
2022-12-02 01:41:45 +00:00
DotNet Bot
4a23b50f97 Merged PR 28071: [internal/release/6.0.1xx] 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.12 to 6.0.13 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.12-servicing.22578.4 to 6.0.13-servicing.22601.6 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.12-servicing.22578.4 to 6.0.13-servicing.22601.6 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Ref**: from 6.0.12 to 6.0.13 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.12-servicing.22568.7 to 6.0.13-servicing.22580.9 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.12 to 6.0.13 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.12 to 6.0.13 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.12 to 6.0.13 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref**: from 6.0.12 to 6.0.13 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.12-servicing.22571.9 to 6.0.13-servicing.22580.13 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.12 to 6.0.13 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.12-servicing.22571.9 to 6.0.13-servicing.22580.13 (parent: Microsoft.NET.Sdk)
  - **dotnet-dev-certs**: from 6.0.12-servicing.22571.9 to 6.0.13-servicing.22580.13 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-secrets**: from 6.0.12-servicing.22571.9 to 6.0.13-servicing.22580.13 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.112 to 6.0.113 (parent: Microsoft.NET.Sdk)
  - **Microsoft.TemplateEngine.Cli**: from 6.0.112-servicing.22571.11 to 6.0.113-servicing.22580.44 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.112 to 6.0.113 (parent: Microsoft.NET.Sdk)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.12 to 6.0.13 (parent: Microsoft.NET.Sdk)
  - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.12-servicing.22568.10 to 6.0.13-servicing.22601.1 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.12 to 6.0.13 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.12-servicing.22569.2 to 6.0.13-servicing.22601.5 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
...
2022-12-02 01:24:30 +00:00
DotNet Bot
985447f2fe Merged PR 28024: [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.WindowsDesktop.App.Ref**: from 6.0.12 to 6.0.13 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.12-servicing.22578.4 to 6.0.13-servicing.22601.1 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.12-servicing.22578.4 to 6.0.13-servicing.22601.1 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.12-servicing.22568.7 to 6.0.13-servicing.22580.9 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Ref**: from 6.0.12 to 6.0.13 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.12-servicing.22568.7 to 6.0.13-servicing.22580.9 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.12 to 6.0.13 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.12 to 6.0.13 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.12 to 6.0.13 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref**: from 6.0.12 to 6.0.13 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.12-servicing.22571.9 to 6.0.13-servicing.22580.13 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.12 to 6.0.13 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.12-servicing.22571.9 to 6.0.13-servicing.22580.13 (parent: Microsoft.NET.Sdk)
  - **dotnet-dev-certs**: from 6.0.12-servicing.22571.9 to 6.0.13-servicing.22580.13 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-secrets**: from 6.0.12-servicing.22571.9 to 6.0.13-servicing.22580.13 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.307 to 6.0.308 (parent: Microsoft.NET.Sdk)
  - **Microsoft.TemplateEngine.Cli**: from 6.0.307-servicing.22575.5 to 6.0.308-servicing.22580.45 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.307 to 6.0.308 (parent: Microsoft.NET.Sdk)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.12 to 6.0.13 (parent: Microsoft.NET.Sdk)
  - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.12-servicing.22568.10 to 6.0.13-servicing.22579.11 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.12 to 6.0.13 (parent: Microsoft.NET.Sdk)
  - **Microsoft...
2022-12-01 19:48:16 +00:00
DotNet Bot
ce091b0466 [internal/release/6.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk 2022-12-01 16:57:37 +00:00
DotNet Bot
0e4e584bba [internal/release/6.0.3xx] Update dependencies from dotnet/source-build-reference-packages 2022-12-01 13:31:18 +00:00
DotNet Bot
98712840e7 [internal/release/6.0.3xx] Update dependencies from dnceng/internal/dotnet-sdk 2022-12-01 10:33:48 +00:00
dotnet-bot
07a449566e Merge in 'release/6.0.3xx' changes 2022-11-30 15:06:05 +00:00
dotnet-maestro-bot
1674f77f14
[automated] Merge branch 'release/6.0.1xx' => 'release/6.0.3xx' (#15058)
* [release/6.0.1xx] Add CI for security-partners-dotnet (#14963)

* Add CI for dotnet-security-partners

* Remove nuget configs from all repo submodules

* Address code review

* Move security-partners ci to tarball/eng dir

* Copy out installer NuGet config before build

* Fix relative path for installer template

* Update src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball.yml

Co-authored-by: Michael Simons <msimons@microsoft.com>

* Revert "Remove nuget configs from all repo submodules"

This reverts commit 87b8a2c523eb03a5d3eee1dcde3e01c15bddc3d2.

Co-authored-by: Michael Simons <msimons@microsoft.com>

* Update branding to 6.0.113

Co-authored-by: Logan Bussell <loganbussell@microsoft.com>
Co-authored-by: Michael Simons <msimons@microsoft.com>
Co-authored-by: Sean Reeser <v-seanreeser@microsoft.com>
Co-authored-by: Marc Paine <marcpop@microsoft.com>
Co-authored-by: Matt Mitchell <mmitche@microsoft.com>
2022-11-30 08:57:17 -06:00
dotnet-bot
6ae229c884 Merge in 'release/6.0.1xx' changes 2022-11-29 20:34:59 +00:00
Marc Paine
2ce3123a08
Merge pull request #15051 from vseanreesermsft/branding-6.0.113-2022-11-29-1042
Update branding to 6.0.113
2022-11-29 12:23:49 -08:00
dotnet-bot
853f30348e Merge in 'release/6.0.3xx' changes 2022-11-29 19:33:00 +00:00
Marc Paine
eead96c50f
Merge pull request #15052 from vseanreesermsft/branding-6.0.308-2022-11-29-1042
Update branding to 6.0.308
2022-11-29 11:22:39 -08:00