Commit graph

26538 commits

Author SHA1 Message Date
dotnet-bot
0975e3111d Merge in 'release/6.0.3xx' changes 2022-10-17 05:58:18 +00:00
v-wuzhai
5dbbf5bf9a
Merge pull request #14773 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-10-16 22:47:56 -07:00
Jason Zhai
4bf500c5fe Merge branch 'release/6.0.4xx' into release/7.0.1xx 2022-10-16 19:26:30 -07:00
Jason Zhai
1ec81a05e2 Merge branch 'release/6.0.1xx' into release/6.0.3xx 2022-10-16 19:20:44 -07:00
DotNet Bot
02944f5bd9 Merged PR 26602: [internal/release/6.0.3xx] Update dependencies from dnceng/internal/dotnet-sdk
This pull request updates the following dependencies

[marker]: <> (Begin:b5bca336-8d99-407e-c145-08d9d60066b9)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- **Subscription**: b5bca336-8d99-407e-c145-08d9d60066b9
- **Build**: 20221015.1
- **Date Produced**: October 16, 2022 7:17:41 AM UTC
- **Commit**: 985b54a445c3c09e95d3f1397f26fccd32be3745
- **Branch**: refs/heads/internal/release/6.0.3xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.305-servicing.22476.47 to 6.0.306-servicing.22515.1][4]
  - **Microsoft.NET.Sdk**: [from 6.0.305-servicing.22476.47 to 6.0.306-servicing.22515.1][4]
  - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.10 to 6.0.11][5]
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.10-servicing.22476.6 to 6.0.11-servicing.22513.9][5]
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: [from 6.0.10-servicing.22476.6 to 6.0.11-servicing.22513.9][5]
  - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.10-servicing.22476.5 to 6.0.11-servicing.22514.6][6]
  - **Microsoft.NETCore.App.Ref**: [from 6.0.10 to 6.0.11][6]
  - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: [from 6.0.10-servicing.22476.5 to 6.0.11-servicing.22514.6][6]
  - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.10 to 6.0.11][6]
  - **Microsoft.NETCore.App.Host.win-x64**: [from 6.0.10 to 6.0.11][6]
  - **Microsoft.NETCore.DotNetHostResolver**: [from 6.0.10 to 6.0.11][6]
  - **Microsoft.NETCore.Platforms**: [from 6.0.6 to 6.0.7][6]
  - **Microsoft.AspNetCore.App.Ref**: [from 6.0.10 to 6.0.11][7]
  - **Microsoft.AspNetCore.App.Ref.Internal**: [from 6.0.10-servicing.22476.17 to 6.0.11-servicing.22507.1][7]
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 6.0.10 to 6.0.11][7]
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: [from 6.0.10-servicing.22476.17 to 6.0.11-servicing.22507.1][7]
  - **dotnet-dev-certs**: [from 6.0.10-servicing.22476.17 to 6.0.11-servicing.22507.1][7]
  - **dotnet-user-secrets**: [from 6.0.10-servicing.22476.17 to 6.0.11-servicing.22507.1][7]
  - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.305 to 6.0.306][8]
  - **Microsoft.TemplateEngine.Cli**: [from 6.0.305-servicing.22476.20 to 6.0.306-servicing.22512.10][8]
  - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: [from 6.0.305 to 6.0.306][8]
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.10 to 6.0.11][5]
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.10 to 6.0.11][5]

[4]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC0c33071&targetVersion=GC985b54a&_a=files
[5]: https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop/branches?baseVersion=GC74607da&targetVersion=GCc71eacb&_a=files
[6]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC5a400c2&targetVersion=GCc672e90&_a=files
[7]: https://dev.a...
2022-10-17 02:12:55 +00:00
DotNet-Bot
5a264cedf4 Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20221015.1
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.305-servicing.22476.47 -> To Version 6.0.306-servicing.22515.1

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.NETCore.Platforms,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.WindowsDesktop.App.Runtime.win-x64
 From Version 6.0.10 -> To Version 6.0.11 (parent: Microsoft.NET.Sdk
2022-10-16 07:45:44 +00:00
Matt Mitchell
e582ffed07
Merge pull request #14713 from vseanreesermsft/internal-merge-6.0.1xx-2022-10-11-1010
Merging internal commits for release/6.0.1xx
2022-10-14 15:30:35 -07:00
Marc Paine
fab947d476
Merge branch 'release/6.0.4xx' into merge/release/6.0.3xx-to-release/6.0.4xx 2022-10-14 15:22:33 -07:00
dotnet-bot
6a91c433df Merge in 'release/7.0.1xx' changes 2022-10-14 21:56:11 +00:00
dotnet-maestro[bot]
810bfe60b3
[release/7.0.1xx] Update dependencies from dotnet/arcade (#14768)
[release/7.0.1xx] Update dependencies from dotnet/arcade


 - Upgrade SourceBuild tasks to net7.
2022-10-14 21:45:52 +00:00
DotNet-Bot
15885a4d76 Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20221014.20
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.305-servicing.22476.47 -> To Version 6.0.306-servicing.22514.20
2022-10-14 21:42:49 +00:00
dotnet-bot
20c1da1dc9 Merge in 'release/6.0.4xx' changes 2022-10-14 20:42:38 +00:00
Matt Mitchell
ea71810acc
Merge pull request #14715 from vseanreesermsft/internal-merge-6.0.4xx-2022-10-11-1011
Merging internal commits for release/6.0.4xx
2022-10-14 13:31:51 -07:00
dotnet-bot
01478152c0 Merge in 'release/6.0.3xx' changes 2022-10-14 19:19:03 +00:00
Matt Mitchell
6f28e25768
Merge pull request #14714 from vseanreesermsft/internal-merge-6.0.3xx-2022-10-11-1010
Merging internal commits for release/6.0.3xx
2022-10-14 12:06:56 -07:00
dotnet-bot
69e04178ff Merge in 'release/7.0.1xx' changes 2022-10-14 17:22:11 +00:00
dotnet-bot
5fb1a516f8 Merge in 'release/6.0.4xx' changes 2022-10-14 17:19:29 +00:00
Marc Paine
2932e0cd7c
Merge branch 'release/6.0.1xx' into internal-merge-6.0.1xx-2022-10-11-1010 2022-10-14 10:06:10 -07:00
Marc Paine
dce0a59853
Merge pull request #14761 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-10-14 10:05:35 -07:00
Marc Paine
799aee7d36
Merge pull request #14762 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-10-14 10:05:19 -07:00
Matt Mitchell
d8128b8378 Merged PR 26744: Merge from public
- Please add description for changes you are making.
- If there is an issue related to this PR, please add the reference.
2022-10-14 16:57:59 +00:00
Matt Mitchell
9442a0d3fd Merge remote-tracking branch 'upstream/release/6.0.4xx' into merge-internal/release/6.0.4xx 2022-10-14 09:33:51 -07:00
dotnet-bot
371154e08a Merge in 'release/7.0.1xx' changes 2022-10-14 10:16:53 +00:00
dotnet-bot
11e39a03dc Merge in 'release/6.0.3xx' changes 2022-10-14 10:16:19 +00:00
v-wuzhai
dc79cf0d57
Merge pull request #14756 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-10-14 03:05:52 -07:00
v-wuzhai
810dd2b330
Merge pull request #14758 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-10-14 03:05:14 -07:00
v-wuzhai
86ead4ee4c
Merge pull request #14748 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-10-14 03:04:59 -07:00
Jason Zhai
850f3f4746 Merge branch 'release/6.0.4xx' into release/7.0.1xx 2022-10-13 19:43:24 -07:00
Jason Zhai
c3379f83f3 Merge branch 'release/6.0.1xx' into release/6.0.3xx 2022-10-13 19:37:29 -07:00
Noah Gilson
8372424d0f
Merge pull request #14754 from dotnet/darc-release/6.0.1xx-44dbe71f-b45c-4fc7-88c6-78195b0f111d
[release/6.0.1xx] Update dependencies from dotnet/arcade
2022-10-13 15:38:45 -07:00
Matt Mitchell
c058f55a7c
Merge branch 'release/6.0.4xx' into internal-merge-6.0.4xx-2022-10-11-1011 2022-10-13 13:47:08 -07:00
dotnet-bot
1288400dfa Merge in 'release/7.0.1xx' changes 2022-10-13 19:39:28 +00:00
Logan Bussell
fbaf018066
[release/7.0.1xx] Change 6's to 7's in Readme for source-build (#14736)
* Change 6's to 7's in readme

* Further clarify support for multiple releases

* Remove both
2022-10-13 14:28:39 -05:00
dotnet-maestro[bot]
dbecfaddc0
Update dependencies from https://github.com/dotnet/arcade build 20221012.3 (#14755)
Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk
 From Version 6.0.0-beta.22463.7 -> To Version 6.0.0-beta.22512.3

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
2022-10-13 11:46:00 -07:00
dotnet-maestro[bot]
dd7d88e075 Update dependencies from https://github.com/dotnet/arcade build 20221012.3
Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk
 From Version 6.0.0-beta.22463.7 -> To Version 6.0.0-beta.22512.3
2022-10-13 17:47:09 +00:00
dotnet-maestro-bot
1b456c2e56
[automated] Merge branch 'release/6.0.4xx' => 'release/7.0.1xx' (#14747)
* [automated] Merge branch 'release/6.0.1xx' => 'release/6.0.3xx' (#14726)

* [release/6.0.1xx] Enable online and offline source-build tarball build in all PRs (#14711)

* Enable online and offline source-build tarball build in all PRs (#14620)

* Fix source-build CI to not run tarball build when tarball creation fails (#14678)

* Fix source-build CI to not run tarball build when tarball creation failed

* Bad fix

* Revert test patch

* update global.json and Versions.props for .NET SDK 6.0.110 (#14717)

* [release/6.0.1xx] Re-write dotnet-watch smoke test (#14367)

* Re-write dotnet-watch smoke test

* Revert async changes

* Disable source-build tarball validation for non 6.0.1xx legs

Co-authored-by: Michael Simons <msimons@microsoft.com>
Co-authored-by: NET Source-Build Bot <102560831+dotnet-sb-bot@users.noreply.github.com>
Co-authored-by: Logan Bussell <loganbussell@microsoft.com>
Co-authored-by: Jason Zhai <v-wuzhai@microsoft.com>

* Update asp.net templates (#14687)

* Update asp.net templates (#14688)

Co-authored-by: Michael Simons <msimons@microsoft.com>
Co-authored-by: NET Source-Build Bot <102560831+dotnet-sb-bot@users.noreply.github.com>
Co-authored-by: Logan Bussell <loganbussell@microsoft.com>
Co-authored-by: Jason Zhai <v-wuzhai@microsoft.com>
Co-authored-by: Marc Paine <marcpop@microsoft.com>
Co-authored-by: William Godbe <wigodbe@microsoft.com>
Co-authored-by: v-wuzhai <46013274+v-wuzhai@users.noreply.github.com>
2022-10-13 12:22:16 -05:00
dotnet-bot
cd4fd1f182 Merge in 'release/7.0.1xx' changes 2022-10-13 13:16:39 +00:00
Logan Bussell
d41bfecf50
[release/7.0.1xx] Port dotnet-watch smoke test fixes (#14738)
* [release/6.0.1xx] Re-write dotnet-watch smoke test (#14367)

* Re-write dotnet-watch smoke test

* Revert async changes

* Re-enable dotnet-watch test
2022-10-13 08:05:35 -05:00
dotnet-bot
ffee7bfe73 Merge in 'release/6.0.3xx' changes 2022-10-13 10:31:45 +00:00
dotnet-bot
fa05489ba9 Merge in 'release/6.0.4xx' changes 2022-10-13 10:31:31 +00:00
v-wuzhai
8226f3fd22
Merge pull request #14744 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-10-13 03:20:25 -07:00
v-wuzhai
e8d067492e
Merge pull request #14743 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-10-13 03:20:06 -07:00
Jason Zhai
2d5b0894c2 Merge branch 'release/6.0.3xx' into release/6.0.4xx 2022-10-12 19:36:30 -07:00
dotnet-bot
cbfaafcfa6 Merge in 'release/7.0.1xx' changes 2022-10-13 02:33:36 +00:00
Jason Zhai
808d78865b Merge branch 'release/6.0.1xx' into release/6.0.3xx 2022-10-12 19:28:52 -07:00
v-wuzhai
5d80bf0a65
Merge pull request #14737 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-10-12 19:24:26 -07:00
William Godbe
1a77d838c5
Update asp.net templates (#14686) 2022-10-13 01:51:21 +00:00
dotnet-bot
fb0b3e448f Merge in 'release/7.0.1xx' changes 2022-10-13 01:27:01 +00:00
William Godbe
9a76ba2452
Update asp.net templates (#14689) 2022-10-13 01:16:20 +00:00
dotnet-bot
b6e7cc35cc Merge in 'release/6.0.4xx' changes 2022-10-12 23:59:24 +00:00