Commit graph

10904 commits

Author SHA1 Message Date
Sean Reeser
f5fae21d12 Merge commit '7771abd614f31fa87deb013fdde3e590495a0c56' into internal-merge-6.0.4xx-2022-08-09-1110 2022-08-09 11:10:29 -07:00
Marc Paine
16df0cb2b2
Merge pull request #14182 from dotnet/darc-release/6.0.4xx-aad6e795-4562-4ce8-b1b6-b44b2ab82baf
[release/6.0.4xx] Update dependencies from dotnet/source-build-reference-packages
2022-08-08 15:49:43 -07:00
dotnet-maestro[bot]
4514a2a032 Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220805.1
Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 6.0.0-servicing.22363.1 -> To Version 6.0.0-servicing.22405.1
2022-08-05 14:28:27 +00:00
dotnet-maestro[bot]
807fbf16c4 Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220804.1
Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 6.0.0-servicing.22363.1 -> To Version 6.0.0-servicing.22404.1
2022-08-04 15:01:09 +00:00
Marc Paine
9d5facb590
Merge branch 'release/6.0.4xx' into merge/release/6.0.3xx-to-release/6.0.4xx 2022-08-02 17:11:45 -07:00
Marc Paine
91727aeb14
Merge branch 'release/6.0.3xx' into merge/release/6.0.1xx-to-release/6.0.3xx 2022-08-02 12:55:16 -07:00
Marc Paine
8c3b1d2045
Revert branding 2022-08-02 12:54:22 -07:00
Marc Paine
9438d7ec6f
Merge pull request #14214 from dotnet/marcpopMSFT-fix50templateversion
Fix the 5.0 wpf/winforms template versions
2022-08-02 12:47:45 -07:00
Marc Paine
7046244198
Servicing label 2022-08-02 12:45:21 -07:00
Sean Reeser
fdea79d106 Update branding to 6.0.401 2022-08-02 09:18:19 -07:00
Sean Reeser
f66d2fea34 Update branding to 6.0.304 2022-08-02 09:18:15 -07:00
Sean Reeser
d7230fb9bd Update branding to 6.0.109 2022-08-02 09:18:10 -07:00
Marc Paine
10cd2639da
Update Versions.props 2022-07-28 10:02:41 -07:00
dotnet-maestro[bot]
d7a4d67024 Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220728.1
Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 6.0.0-servicing.22363.1 -> To Version 6.0.0-servicing.22378.1
2022-07-28 14:53:29 +00:00
dotnet-maestro[bot]
a6eb5ad33e Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220727.1
Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 6.0.0-servicing.22363.1 -> To Version 6.0.0-servicing.22377.1
2022-07-27 15:04:08 +00:00
dotnet-maestro[bot]
f6d8ed6077 Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220722.1
Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 6.0.0-servicing.22363.1 -> To Version 6.0.0-servicing.22372.1
2022-07-22 15:45:39 +00:00
dotnet-maestro[bot]
f2596c2ac9 Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220720.1
Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 6.0.0-servicing.22363.1 -> To Version 6.0.0-servicing.22370.1
2022-07-20 15:27:24 +00:00
DotNet Bot
146342f407 Merged PR 24234: [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.8 to 6.0.8 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.8-servicing.22363.10 to 6.0.8-servicing.22368.4 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.8-servicing.22363.10 to 6.0.8-servicing.22368.4 (parent: Microsoft.NET.Sdk)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.8 to 6.0.8 (parent: Microsoft.NET.Sdk)
  - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.8-servicing.22363.7 to 6.0.8-servicing.22368.4 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.8 to 6.0.8 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.8-servicing.22363.8 to 6.0.8-servicing.22368.7 (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**: 20220718.21
- **Date Produced**: July 18, 2022 9:43:20 PM UTC
- **Commit**: 533f5a20a40174a9fa9c3fd9c0bf954e9ebd132e
- **Branch**: refs/heads/internal/release/6.0.4xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.400-rtm.22367.6 to 6.0.400-rtm.22368.21][1]
  - **Microsoft.NET.Sdk**: [from 6.0.400-rtm.22367.6 to 6.0.400-rtm.22368.21][1]
  - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.8 to 6.0.8][2]
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.8-servicing.22363.10 to 6.0.8-servicing.22368.4][2]
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: [from 6.0.8-servicing.22363.10 to 6.0.8-servicing.22368.4][2]
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.8 to 6.0.8][2]
  - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.8-servicing.22363.7 to 6.0.8-servicing.22368.4][3]
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.8 to 6.0.8][2]
  - **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 6.0.8-servicing.22363.8 to 6.0.8-servicing.22368.7][4]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC4289799&targetVersion=GC533f5a2&_a=files
[2]: https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop...
2022-07-18 22:23:06 +00:00
DotNet-Bot
7b317fc1e0 Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220717.6
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.400-rtm.22365.19 -> To Version 6.0.400-rtm.22367.6

Dependency coherency updates

Microsoft.Net.Compilers.Toolset
 From Version 4.3.0-3.22363.19 -> To Version 4.3.0-3.22365.10 (parent: Microsoft.NET.Sdk
2022-07-18 04:37:00 +00:00
DotNet-Bot
a350ed8b1d Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220715.19
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.400-preview.22364.3 -> To Version 6.0.400-rtm.22365.19

Dependency coherency updates

Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,VS.Redist.Common.NetCore.SharedFramework.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.Build
 From Version 6.0.7 -> To Version 6.0.8 (parent: Microsoft.NET.Sdk
2022-07-15 23:31:21 +00:00
DotNet-Bot
1a93c8b6eb Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220715.11
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.400-preview.22364.3 -> To Version 6.0.400-rtm.22365.11

Dependency coherency updates

Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,VS.Redist.Common.NetCore.SharedFramework.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.Build
 From Version 6.0.7 -> To Version 6.0.8 (parent: Microsoft.NET.Sdk
2022-07-15 19:40:37 +00:00
Marc Paine
7a5b36b4a4
Merge pull request #13851 from dotnet/darc-release/6.0.4xx-6a07086d-2076-46c3-8687-e9435a81260c
[release/6.0.4xx] Update dependencies from dotnet/source-build-reference-packages
2022-07-14 16:33:24 -07:00
Marc Paine
5cb321b875
Update Versions.props 2022-07-14 11:12:45 -07:00
dotnet-maestro[bot]
9cec012147 Update dependencies from https://github.com/dotnet/sdk build 20220714.3
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.400-preview.22363.52 -> To Version 6.0.400-preview.22364.3

Dependency coherency updates

Microsoft.Net.Compilers.Toolset
 From Version 4.3.0-3.22329.30 -> To Version 4.3.0-3.22363.19 (parent: Microsoft.NET.Sdk
2022-07-14 10:00:27 +00:00
dotnet-maestro[bot]
9ff3ee5fc9 Update dependencies from https://github.com/dotnet/sdk build 20220713.52
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.400-preview.22363.39 -> To Version 6.0.400-preview.22363.52

Dependency coherency updates

NuGet.Build.Tasks
 From Version 6.3.0-rc.123 -> To Version 6.3.0-rc.128 (parent: Microsoft.NET.Sdk
2022-07-14 05:33:51 +00:00
dotnet-maestro[bot]
559f1a1e4d Update dependencies from https://github.com/dotnet/sdk build 20220713.39
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.400-preview.22363.31 -> To Version 6.0.400-preview.22363.39
2022-07-14 01:08:57 +00:00
Marc Paine
932c17e5f3
Merge pull request #14136 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-07-13 16:59:13 -07:00
dotnet-maestro[bot]
3b240faef4 Update dependencies from https://github.com/dotnet/sdk build 20220713.31
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.400-preview.22362.24 -> To Version 6.0.400-preview.22363.31

Dependency coherency updates

Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp
 From Version 12.0.4-beta.22330.3 -> To Version 12.0.4-beta.22363.4 (parent: Microsoft.NET.Sdk
2022-07-13 22:28:52 +00:00
Marc Paine
356e832251
Merge branch 'release/6.0.3xx' into merge/release/6.0.1xx-to-release/6.0.3xx 2022-07-13 11:45:16 -07:00
Marc Paine
2c9908fc80
Merge pull request #14117 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-07-13 11:44:27 -07:00
NET Source-Build Bot
3c4e56a00a
update global.json and Versions.props for .NET SDK 6.0.107 (#14121) 2022-07-13 09:23:43 -07:00
dotnet-maestro[bot]
a3290bfa2d Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220713.1
Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 6.0.0-servicing.22262.1 -> To Version 6.0.0-servicing.22363.1
2022-07-13 15:07:24 +00:00
dotnet-maestro[bot]
ffa6a7bb74 Update dependencies from https://github.com/dotnet/sdk build 20220712.24
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.400-preview.22361.12 -> To Version 6.0.400-preview.22362.24

Dependency coherency updates

Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,NuGet.Build.Tasks
 From Version 6.0.400-preview.22330.1 -> To Version 6.0.400-preview.22358.2 (parent: Microsoft.NET.Sdk
2022-07-13 00:54:57 +00:00
dotnet-maestro[bot]
13a3901c10 Update dependencies from https://github.com/dotnet/sdk build 20220712.18
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.400-preview.22361.12 -> To Version 6.0.400-preview.22362.18

Dependency coherency updates

Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,NuGet.Build.Tasks
 From Version 6.0.400-preview.22330.1 -> To Version 6.0.400-preview.22358.2 (parent: Microsoft.NET.Sdk
2022-07-12 23:04:27 +00:00
Marc Paine
96fd3f4e9d
Merge branch 'release/6.0.4xx' into merge/release/6.0.3xx-to-release/6.0.4xx 2022-07-12 15:55:24 -07:00
dotnet-maestro[bot]
50bd0f6567 Update dependencies from https://github.com/dotnet/sdk build 20220712.14
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.400-preview.22361.12 -> To Version 6.0.400-preview.22362.14
2022-07-12 21:49:35 +00:00
William Godbe
b5fa5e2caf
Update asp.net template version (#14110) 2022-07-12 12:14:03 -07:00
William Godbe
853275fdcb
Update Asp.Net template (#14111) 2022-07-12 12:13:55 -07:00
William Godbe
e22344fc38
Update asp.net template version (#14112) 2022-07-12 12:13:47 -07:00
Will Godbe
23a55e8341 Merge commit 'f6ec7508e3b20ad6fbc4ffa8ea4ed8818ffccc1d' into internal-merge-6.0.1xx-2022-07-12-1057 2022-07-12 10:57:21 -07:00
Will Godbe
4d81493240 Merge commit 'c857713418e715e1ca1a5c9fa5c360aaf71d2231' into internal-merge-6.0.3xx-2022-07-12-1057 2022-07-12 10:57:14 -07:00
Marc Paine
fcac10b492
Merge pull request #14082 from mmitche/branding-6.0.303-2022-07-05-1230
Update branding to 6.0.303
2022-07-12 09:17:07 -07:00
dotnet-maestro[bot]
6a9c07da4d Update dependencies from https://github.com/dotnet/sdk build 20220711.12
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.400-preview.22361.7 -> To Version 6.0.400-preview.22361.12
2022-07-11 23:21:37 +00:00
dotnet-maestro[bot]
ef25719e7c Update dependencies from https://github.com/dotnet/sdk build 20220711.7
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.400-preview.22356.20 -> To Version 6.0.400-preview.22361.7

Dependency coherency updates

Microsoft.NET.Test.Sdk
 From Version 17.3.0-release-20220627-03 -> To Version 17.3.0-release-20220708-01 (parent: Microsoft.NET.Sdk
2022-07-11 17:11:21 +00:00
dotnet-maestro[bot]
5eb8a241c8 Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220707.1
Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 6.0.0-servicing.22262.1 -> To Version 6.0.0-servicing.22357.1
2022-07-07 14:58:40 +00:00
Marc Paine
af4b8739b3 run update dependencies. This may conflict when it tries to merge internally though 2022-07-06 16:49:00 -07:00
dotnet-maestro[bot]
b27b4ecf9f Update dependencies from https://github.com/dotnet/sdk build 20220706.20
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.400-preview.22355.11 -> To Version 6.0.400-preview.22356.20
2022-07-06 22:38:20 +00:00
Marc Paine
2e0a0276d8
Merge pull request #14075 from dotnet/Jason/UpdateAlpine313
Update alpine.3.13 to the new one
2022-07-06 14:47:43 -07:00
dotnet-maestro[bot]
e77bb371d7 Update dependencies from https://github.com/dotnet/sdk build 20220705.11
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.400-preview.22351.11 -> To Version 6.0.400-preview.22355.11
2022-07-06 00:32:05 +00:00
Matt Mitchell
da15ec1396 Update branding to 6.0.303 2022-07-05 12:30:19 -07:00