Commit graph

26209 commits

Author SHA1 Message Date
Marc Paine
b110fd5fe9
Merge pull request #14693 from dotnet/marcpopMSFT-addtelemetrytest
Add a prototype telemetry setting test.
2022-11-01 16:02:18 -07:00
Marc Paine
6924418fc8
Merge pull request #14838 from vseanreesermsft/branding-7.0.101-2022-10-27-0951
Update branding to 7.0.101
2022-11-01 14:55:45 -07:00
Marc Paine
3f43116264
Update Versions.props 2022-11-01 10:24:46 -07:00
Logan Bussell
3079e52002
[release/7.0.1xx] Increase dotnet-watch source-build smoke test timeout (#14842)
* Up timeout for dotnet-watch smoke test

* Add more descriptive timeout message
2022-10-31 09:10:33 -05:00
Michael Simons
bf9d4a0e2c
Refactor source-build CI triggers and pools (#14835) 2022-10-27 13:48:47 -05:00
Sean Reeser
e1910d8fe0 Update branding to 7.0.101 2022-10-27 09:51:43 -07:00
Marc Paine
4f0837a5ef Remove prior verison of test. 2022-10-25 10:55:35 -07:00
Marc Paine
1138045cdd
Update TelemetryOptOutDefaultTests.cs 2022-10-24 15:48:03 -07:00
Marc Paine
d780b35afa Updating the test for the changes in the SDK repo. 2022-10-20 12:52:17 -07:00
Marc Paine
a3d39216d2 Add a prototype telemetry setting test. 2022-10-20 12:52:17 -07:00
Michael Simons
e6dd91c290
Update source-build tarball CI to utilize faster build agents (#14794) 2022-10-19 22:25:52 +00:00
ae56e0f10c
Add support for ARM platform (#14592) 2022-10-19 17:09:33 -05:00
v-wuzhai
036f883b74
Merge pull request #14770 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-17 01:14:28 -07:00
Jason Zhai
4bf500c5fe Merge branch 'release/6.0.4xx' into release/7.0.1xx 2022-10-16 19:26:30 -07: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
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
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
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
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
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
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
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
William Godbe
9a76ba2452
Update asp.net templates (#14689) 2022-10-13 01:16:20 +00:00
William Godbe
ab2fa01742
Update asp.net templates (#14688) 2022-10-12 23:48:00 +00:00
William Godbe
0de6184891
Update asp.net templates (#14687) 2022-10-12 23:43:50 +00:00
Marc Paine
185c87b36c
Merge branch 'release/7.0.1xx' into merge/release/6.0.4xx-to-release/7.0.1xx 2022-10-12 15:32:32 -07:00
Marc Paine
216b75ce9c
Merge pull request #14742 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-12 15:30:16 -07:00
Marc Paine
f982f388ce
Merge pull request #14718 from dotnet/nagilson-tempfix-7.0.1xx
[7.0.1xx] Use mktemp to correctly use temp files
2022-10-12 14:33:13 -07:00
dotnet-maestro-bot
0263b7b7da
[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>
2022-10-12 16:14:53 -05:00
dotnet-maestro[bot]
9bb8d116b0
[release/7.0.1xx] Update dependencies from dotnet/sdk (#14725)
[release/7.0.1xx] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.WindowsDesktop.App.Ref: from 7.0.0-rtm.22507.2 to 7.0.0 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0: from 7.0.0-rtm.22507.2 to 7.0.0-rtm.22511.3 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0: from 7.0.0-rtm.22507.2 to 7.0.0-rtm.22511.3 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Ref: from 7.0.0-rtm.22507.1 to 7.0.0-rtm.22511.4 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.NetCore.TargetingPack.x64.7.0: from 7.0.0-rtm.22507.1 to 7.0.0-rtm.22511.4 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Runtime.win-x64: from 7.0.0-rtm.22507.1 to 7.0.0-rtm.22511.4 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Host.win-x64: from 7.0.0-rtm.22507.1 to 7.0.0-rtm.22511.4 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.DotNetHostResolver: from 7.0.0-rtm.22507.1 to 7.0.0-rtm.22511.4 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.Platforms: from 7.0.0-rtm.22507.1 to 7.0.0-rtm.22511.4 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Ref: from 7.0.0-rtm.22504.29 to 7.0.0-rtm.22512.1 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Ref.Internal: from 7.0.0-rtm.22504.29 to 7.0.0-rtm.22512.1 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Runtime.win-x64: from 7.0.0-rtm.22504.29 to 7.0.0-rtm.22512.1 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0: from 7.0.0-rtm.22504.29 to 7.0.0-rtm.22512.1 (parent: Microsoft.NET.Sdk)
  - dotnet-dev-certs: from 7.0.0-rtm.22504.29 to 7.0.0-rtm.22512.1 (parent: Microsoft.NET.Sdk)
  - dotnet-user-jwts: from 7.0.0-rtm.22504.29 to 7.0.0-rtm.22512.1 (parent: Microsoft.NET.Sdk)
  - dotnet-user-secrets: from 7.0.0-rtm.22504.29 to 7.0.0-rtm.22512.1 (parent: Microsoft.NET.Sdk)
  - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 7.0.0-rtm.22507.2 to 7.0.0 (parent: Microsoft.NET.Sdk)
  - Microsoft.Dotnet.WinForms.ProjectTemplates: from 7.0.0-rtm.22506.1 to 7.0.0-rtm.22511.7 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 7.0.0-rtm.22507.2 to 7.0.0 (parent: Microsoft.NET.Sdk)
  - Microsoft.DotNet.Wpf.ProjectTemplates: from 7.0.0-rtm.22506.9 to 7.0.0-rtm.22511.4 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - Microsoft.FSharp.Compiler: from 12.0.5-beta.22507.6 to 12.0.5-beta.22510.6 (parent: Microsoft.NET.Sdk)
  - Microsoft.SourceBuild.Intermediate.fsharp: from 7.0.0-beta.22507.6 to 7.0.0-beta.22510.6 (parent: Microsoft.NET.Sdk)
  - Microsoft.Net.Compilers.Toolset: from 4.4.0-3.22507.1 to 4.4.0-3.22511.14 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.NetCore.SharedFramework.x64.7.0: from 7.0.0-rtm.22507.1 to 7.0.0-rtm.22511.4 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.NetCore.SharedFramework.x64.7.0: from 7.0.0-rtm.22507.1 to 7.0.0-rtm.22511.4 (parent: Microsoft.NET.Sdk)

 - Remove backported source-build patches

 - Merge branch 'release/7.0.1xx' of https://github.com/dotnet/installer into darc-release/7.0.1xx-629cfea0-7f3f-4b78-b783-1b6dc7af9224
2022-10-12 20:29:30 +00:00
Marc Paine
bc84fe8d35
Merge pull request #14721 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-12 11:19:28 -07:00
Marc Paine
93dd7d6622
Stable branding (#14729) 2022-10-12 08:11:05 -07:00
Jason Zhai
0d31263c5b Merge branch 'release/6.0.3xx' into release/6.0.4xx 2022-10-12 00:13:19 -07:00
Logan Bussell
7aec869534
[release/6.0.1xx] Re-write dotnet-watch smoke test (#14367)
* Re-write dotnet-watch smoke test

* Revert async changes
2022-10-12 01:57:55 +00:00
Logan Bussell
f3606a0adb
[release/7.0.1xx] .NET Source-Build 7.0.100-rc.2 October 2022 Updates (#14728)
* Update source-build to 7.0 RC2

* Also update tarball global.json

* Don't touch root global.json in case it is managed by automation
2022-10-12 00:46:30 +00:00
NET Source-Build Bot
c12ac467c7
update global.json and Versions.props for .NET SDK 6.0.110 (#14717) 2022-10-11 23:42:38 +00:00