Commit graph

23659 commits

Author SHA1 Message Date
v-wuzhai
6d90bbe8c0
Merge pull request #13316 from dotnet/darc-main-ee5ee13b-9653-465d-b6c2-fd49854e38ab
[main] Update dependencies from dotnet/source-build-reference-packages
2022-03-04 12:26:19 +08:00
v-wuzhai
4148f064b0
Merge pull request #13319 from dotnet/darc-release/6.0.1xx-e3fbbc0b-0a58-441f-879b-2baa99b26c2d
[release/6.0.1xx] Update dependencies from dotnet/source-build-reference-packages
2022-03-04 12:25:42 +08:00
v-wuzhai
2d8034134f
Merge pull request #13228 from dotnet/darc-release/6.0.2xx-c4c73741-470d-4e92-aabd-a4c047629eb4
[release/6.0.2xx] Update dependencies from dotnet/source-build-reference-packages
2022-03-04 11:08:57 +08:00
dotnet-maestro[bot]
6678983b02 Update dependencies from https://github.com/dotnet/sdk build 20220303.19
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 7.0.100-preview.3.22153.1 -> To Version 7.0.100-preview.3.22153.19

Dependency coherency updates

Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-secrets,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,NuGet.Build.Tasks,Microsoft.SourceBuild.Intermediate.source-build-externals
 From Version 7.0.0-preview.3.22152.6 -> To Version 7.0.0-preview.3.22153.3 (parent: Microsoft.NET.Sdk
2022-03-04 02:58:13 +00:00
dotnet-maestro[bot]
e868bd247a Update dependencies from https://github.com/dotnet/sdk build 20220303.15
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 7.0.100-preview.3.22153.1 -> To Version 7.0.100-preview.3.22153.15

Dependency coherency updates

Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-secrets,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,NuGet.Build.Tasks,Microsoft.SourceBuild.Intermediate.source-build-externals
 From Version 7.0.0-preview.3.22152.6 -> To Version 7.0.0-preview.3.22153.3 (parent: Microsoft.NET.Sdk
2022-03-04 00:48:18 +00:00
dotnet-maestro[bot]
db7c075764 Update dependencies from https://github.com/dotnet/sdk build 20220303.13
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 7.0.100-preview.3.22153.1 -> To Version 7.0.100-preview.3.22153.13

Dependency coherency updates

Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,NuGet.Build.Tasks,Microsoft.SourceBuild.Intermediate.source-build-externals
 From Version 7.0.100-preview.3.22118.1 -> To Version 7.0.100-preview.3.22126.4 (parent: Microsoft.NET.Sdk
2022-03-03 23:31:54 +00:00
dotnet-maestro[bot]
be27bd9e9e Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220303.3
Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 7.0.0-alpha.1.22152.1 -> To Version 7.0.0-alpha.1.22153.3
2022-03-03 23:19:40 +00:00
dotnet-maestro[bot]
abe53ee3e3 Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220303.2
Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 6.0.0-servicing.22110.1 -> To Version 6.0.0-servicing.22153.2
2022-03-03 23:14:49 +00:00
dotnet-maestro[bot]
e2c59875fd Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220303.2
Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 6.0.0-servicing.22151.1 -> To Version 6.0.0-servicing.22153.2
2022-03-03 23:14:44 +00:00
Marc Paine
b5faf4fbfa
Merge pull request #13236 from dotnet/marcpopMSFT-catchup60300
Merge 6.0.200 into 6.0.3xx
2022-03-03 14:08:15 -08:00
dotnet-maestro[bot]
9bb8f2b46f Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220303.1
Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 7.0.0-alpha.1.22152.1 -> To Version 7.0.0-alpha.1.22153.1
2022-03-03 21:19:20 +00:00
dotnet-maestro[bot]
d9e4b65e42 Update dependencies from https://github.com/dotnet/sdk build 20220303.7
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 7.0.100-preview.3.22153.1 -> To Version 7.0.100-preview.3.22153.7

Dependency coherency updates

Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,NuGet.Build.Tasks,Microsoft.SourceBuild.Intermediate.source-build-externals
 From Version 7.0.100-preview.3.22118.1 -> To Version 7.0.100-preview.3.22126.4 (parent: Microsoft.NET.Sdk
2022-03-03 19:59:15 +00:00
dotnet-maestro[bot]
e6c23bccf9
Update dependencies from https://github.com/dotnet/arcade build 20220302.1 (#13310)
[main] Update dependencies from dotnet/arcade
- Coherency Updates:
  - Microsoft.SourceLink.GitHub: from 1.2.0-beta-22127-02 to 1.2.0-beta-22128-02 (parent: Microsoft.DotNet.Arcade.Sdk)
2022-03-03 19:07:02 +00:00
Marc Paine
565c3b2885
Merge pull request #13307 from dotnet/marcpopMSFT-CGFixes
Merge pull request #12604 from dkurepa/ResolveComponentGovernance
2022-03-03 11:04:11 -08:00
Marc Paine
1e1a69ca34
Merge pull request #13308 from dotnet/marcpopMSFT-CGFixes602
Merge pull request #12604 from dkurepa/ResolveComponentGovernance
2022-03-03 11:04:07 -08:00
Marc Paine
65c3392c68
Fix the version stabilization merge 2022-03-03 11:03:28 -08:00
Marc Paine
f37dbb8764
Fix some downgrades in the version details 2022-03-03 11:03:02 -08:00
dotnet-maestro[bot]
222a327cf7 Update dependencies from https://github.com/dotnet/sdk build 20220303.4
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 7.0.100-preview.3.22153.1 -> To Version 7.0.100-preview.3.22153.4

Dependency coherency updates

Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,NuGet.Build.Tasks,Microsoft.SourceBuild.Intermediate.source-build-externals
 From Version 7.0.100-preview.3.22118.1 -> To Version 7.0.100-preview.3.22126.4 (parent: Microsoft.NET.Sdk
2022-03-03 18:34:50 +00:00
dotnet-maestro[bot]
58f79b73da Update dependencies from https://github.com/dotnet/sdk build 20220303.3
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 7.0.100-preview.3.22153.1 -> To Version 7.0.100-preview.3.22153.3

Dependency coherency updates

Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli
 From Version 7.0.100-preview.3.22118.1 -> To Version 7.0.100-preview.3.22126.4 (parent: Microsoft.NET.Sdk
2022-03-03 17:03:24 +00:00
Daniel Plaisted
d354b6a6e3
Merge pull request #13132 from EgorBo/extend-product-commit-txt
Save runtime commit to productCommit-rid.txt
2022-03-03 08:55:42 -08:00
dotnet-maestro[bot]
5d19d7d51d Update dependencies from https://github.com/dotnet/sdk build 20220303.2
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 7.0.100-preview.3.22153.1 -> To Version 7.0.100-preview.3.22153.2

Dependency coherency updates

Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli
 From Version 7.0.100-preview.3.22118.1 -> To Version 7.0.100-preview.3.22126.4 (parent: Microsoft.NET.Sdk
2022-03-03 15:13:12 +00:00
dotnet-maestro[bot]
506f7ec3ad
[main] Update dependencies from dotnet/sdk (#13253)
[main] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.WindowsDesktop.App.Ref: from 7.0.0-preview.3.22116.6 to 7.0.0-preview.3.22128.8 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0: from 7.0.0-preview.3.22116.6 to 7.0.0-preview.3.22128.8 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0: from 7.0.0-preview.3.22116.6 to 7.0.0-preview.3.22128.8 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Ref: from 7.0.0-preview.2.22116.9 to 7.0.0-preview.3.22151.6 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.NetCore.TargetingPack.x64.7.0: from 7.0.0-preview.2.22116.9 to 7.0.0-preview.3.22151.6 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Runtime.win-x64: from 7.0.0-preview.2.22116.9 to 7.0.0-preview.3.22151.6 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Host.win-x64: from 7.0.0-preview.2.22116.9 to 7.0.0-preview.3.22151.6 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.DotNetHostResolver: from 7.0.0-preview.2.22116.9 to 7.0.0-preview.3.22151.6 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.Platforms: from 7.0.0-preview.2.22116.9 to 7.0.0-preview.3.22151.6 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Ref: from 7.0.0-preview.3.22117.6 to 7.0.0-preview.3.22152.6 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Ref.Internal: from 7.0.0-preview.3.22117.6 to 7.0.0-preview.3.22152.6 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Runtime.win-x64: from 7.0.0-preview.3.22117.6 to 7.0.0-preview.3.22152.6 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0: from 7.0.0-preview.3.22117.6 to 7.0.0-preview.3.22152.6 (parent: Microsoft.NET.Sdk)
  - dotnet-dev-certs: from 7.0.0-preview.3.22117.6 to 7.0.0-preview.3.22152.6 (parent: Microsoft.NET.Sdk)
  - dotnet-user-secrets: from 7.0.0-preview.3.22117.6 to 7.0.0-preview.3.22152.6 (parent: Microsoft.NET.Sdk)
  - Microsoft.DotNet.Common.ItemTemplates: from 7.0.100-preview.2.22116.8 to 7.0.100-preview.3.22118.1 (parent: Microsoft.NET.Sdk)
  - Microsoft.TemplateEngine.Cli: from 7.0.100-preview.2.22116.8 to 7.0.100-preview.3.22118.1 (parent: Microsoft.NET.Sdk)
  - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 7.0.0-preview.3.22116.6 to 7.0.0-preview.3.22128.8 (parent: Microsoft.NET.Sdk)
  - Microsoft.Dotnet.WinForms.ProjectTemplates: from 7.0.0-preview.3.22115.11 to 7.0.0-preview.3.22128.3 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 7.0.0-preview.3.22116.6 to 7.0.0-preview.3.22128.8 (parent: Microsoft.NET.Sdk)
  - Microsoft.DotNet.Wpf.ProjectTemplates: from 7.0.0-preview.3.22116.5 to 7.0.0-preview.3.22128.5 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - Microsoft.NET.Test.Sdk: from 17.2.0-preview-20220216-08 to 17.2.0-preview-20220301-01 (parent: Microsoft.NET.Sdk)
  - Microsoft.NET.ILLink.Tasks: from 7.0.100-1.22117.4 to 7.0.100-1.22151.3 (parent: Microsoft.NET.Sdk)
  - Microsoft.Net.Compilers.Toolset: from 4.2.0-1.22116.16 to 4.2.0-3.22151.16 (parent: Microsoft.NET.Sdk)
  - Microsoft.Build: from 17.2.0-preview-22116-02 to 17.2.0-preview-22123-01 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.NetCore.SharedFramework.x64.7.0: from 7.0.0-preview.2.22116.9 to 7.0.0-preview.3.22151.6 (parent: Microsoft.NET.Sdk)
  - Microsoft.NET.Workload.Emscripten.Manifest-7.0.100: from 7.0.0-alpha.2.22111.1 to 7.0.0-preview.3.22122.1 (parent: VS.Redist.Common.NetCore.SharedFramework.x64.7.0)
  - Microsoft.SourceBuild.Intermediate.source-build-externals: from 7.0.0-alpha.1.22114.1 to 7.0.0-alpha.1.22151.1 (parent: Microsoft.NET.Sdk)
2022-03-03 14:45:01 +00:00
Michael Simons
3dfda06124
Rewrite smoke-tests.sh in new test framework based smoke tests (#13286) 2022-03-03 08:02:48 -06:00
Djuradj Kurepa
87a7258c1f Merge pull request #12604 from dkurepa/ResolveComponentGovernance
Resolve Component Governance alerts
2022-03-02 17:29:14 -08:00
Djuradj Kurepa
68182c36d0 Merge pull request #12604 from dkurepa/ResolveComponentGovernance
Resolve Component Governance alerts
2022-03-02 17:27:57 -08:00
Marc Paine
3eeb6550b7
Merge pull request #13306 from dotnet/darc-main-e09e3e78-eddb-4e8f-ac0a-5ed6a405203d
[main] Update dependencies from dotnet/source-build-reference-packages
2022-03-02 14:48:54 -08:00
Marc Paine
160c1396de
Merge pull request #13304 from dotnet/darc-main-88332ffe-4298-4171-b031-ebd359decf26
[main] Update dependencies from dotnet/arcade
2022-03-02 14:48:47 -08:00
Marc Paine
b305016c87
Merge pull request #12790 from dotnet/marcpopMSFT-workloadmanifesttxt
Fix the logic that generates the fallback text file
2022-03-02 14:48:26 -08:00
Marc Paine
f6de171402
Merge pull request #13294 from vseanreesermsft/branding-6.0.104-2022-03-01-1055
Update branding to 6.0.104
2022-03-02 14:48:03 -08:00
Michael Simons
5e3471b471
Always run sb bootstrap CI leg (#13300) 2022-03-02 15:58:55 -06:00
dotnet-maestro[bot]
0786124810 Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220302.1
Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 7.0.0-alpha.1.22151.2 -> To Version 7.0.0-alpha.1.22152.1
2022-03-02 19:36:43 +00:00
Matt Mitchell
20fb83d5f4
Merge branch 'release/6.0.3xx' into marcpopMSFT-catchup60300 2022-03-02 11:29:43 -08:00
dotnet-maestro[bot]
1b41ee40bb Update dependencies from https://github.com/dotnet/arcade build 20220301.1
Microsoft.DotNet.CMake.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Arcade.Sdk
 From Version 7.0.0-beta.22124.4 -> To Version 7.0.0-beta.22151.1

Dependency coherency updates

Microsoft.SourceLink.GitHub,Microsoft.DotNet.XliffTasks
 From Version 1.2.0-beta-22121-02 -> To Version 1.2.0-beta-22127-02 (parent: Microsoft.DotNet.Arcade.Sdk
2022-03-02 13:25:45 +00:00
v-wuzhai
1cd4a8f22c
Merge pull request #13302 from dotnet-maestro-bot/merge/release/6.0.3xx-to-main
[automated] Merge branch 'release/6.0.3xx' => 'main'
2022-03-02 15:24:45 +08:00
Jason Zhai
4db267cfec Merge branch 'release/6.0.3xx' into main 2022-03-01 22:15:46 -08:00
v-wuzhai
d64012210f
Merge pull request #13291 from dotnet/darc-main-609e859e-ca1f-47be-ac45-ae8152b1d5cc
[main] Update dependencies from dotnet/test-templates
2022-03-02 13:42:47 +08:00
v-wuzhai
f87228ef9c
Merge pull request #13298 from dotnet/darc-release/6.0.1xx-0dff2ed3-557d-4859-916c-843dc46ccf60
[release/6.0.1xx] Update dependencies from dotnet/source-build-reference-packages
2022-03-02 13:41:55 +08:00
v-wuzhai
276db11c76
Merge pull request #13301 from dotnet/darc-main-36dca6f1-7735-43a9-89c2-7d0c337989c4
[main] Update dependencies from dotnet/source-build-reference-packages
2022-03-02 13:41:07 +08:00
v-wuzhai
c5b0a4598d
Merge pull request #13297 from dotnet/darc-release/6.0.3xx-3d838e82-6c96-4cca-aa52-a582a663ff80
[release/6.0.3xx] Update dependencies from dotnet/source-build-reference-packages
2022-03-02 12:22:33 +08:00
Michael Simons
ccf17282ea
Update source-build's MsftToSbSdk baseline (#13296) 2022-03-01 19:17:45 -06:00
dotnet-maestro[bot]
df7847700c Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220301.2
Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 7.0.0-alpha.1.22128.2 -> To Version 7.0.0-alpha.1.22151.2
2022-03-01 23:53:18 +00:00
dotnet-maestro[bot]
ca993728b6 Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220301.1
Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 6.0.0-servicing.22110.1 -> To Version 6.0.0-servicing.22151.1
2022-03-01 19:15:30 +00:00
dotnet-maestro[bot]
8535d69714 Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220301.1
Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 6.0.0-servicing.22123.1 -> To Version 6.0.0-servicing.22151.1
2022-03-01 19:15:25 +00:00
dotnet-maestro[bot]
58fd11ce6c Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220301.1
Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 6.0.0-servicing.22123.1 -> To Version 6.0.0-servicing.22151.1
2022-03-01 19:15:19 +00:00
Sean Reeser
717d2e214b Update branding to 6.0.202 2022-03-01 10:55:33 -08:00
Sean Reeser
30bbc7d8e3 Update branding to 6.0.104 2022-03-01 10:55:28 -08:00
Michael Simons
e8a47cb304
Remove unused legacy template references from source-build (#13173) 2022-03-01 11:42:54 -06:00
Michael Simons
88bf53f746
Adjust handling of reference packages directory (#13238) 2022-03-01 11:39:47 -06:00
dotnet-maestro[bot]
b95784c3e9 Update dependencies from https://github.com/dotnet/test-templates build 20220228.1
Microsoft.DotNet.Test.ProjectTemplates.2.1 , Microsoft.DotNet.Test.ProjectTemplates.5.0 , Microsoft.DotNet.Test.ProjectTemplates.6.0 , Microsoft.DotNet.Test.ProjectTemplates.7.0
 From Version 1.0.2-beta4.22125.1 -> To Version 1.0.2-beta4.22128.1
2022-03-01 09:20:00 +00:00
v-wuzhai
ab332adae5
Merge pull request #13290 from dotnet/darc-main-0d7d87dd-cabb-4a33-a5f6-03adf8d9635b
[main] Update dependencies from dotnet/source-build-reference-packages
2022-03-01 14:20:06 +08:00