mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
24430 commits 41 branches 190 tags 95 MiB
Commit graph

24430 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
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
a3ce748718 Merged PR 26743: 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:56 +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
Matt Mitchell
4961cd6121 Merge remote-tracking branch 'upstream/release/6.0.1xx' into merge-internal/release/6.0.1xx 2022-10-14 09:32:14 -07:00
dotnet-bot
11e39a03dc Merge in 'release/6.0.3xx' changes 2022-10-14 10:16:19 +00: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
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-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-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
Jason Zhai
808d78865b Merge branch 'release/6.0.1xx' into release/6.0.3xx 2022-10-12 19:28:52 -07:00
dotnet-bot
6939761778 Merge in 'release/6.0.1xx' changes 2022-10-13 02:02:33 +00:00
William Godbe
1a77d838c5
Update asp.net templates (#14686) 2022-10-13 01:51:21 +00:00
dotnet-bot
b6e7cc35cc Merge in 'release/6.0.4xx' changes 2022-10-12 23:59:24 +00:00
dotnet-bot
46766171dc Merge in 'release/6.0.3xx' changes 2022-10-12 23:54:53 +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
dotnet-bot
81f3e48d0c Merge in 'release/6.0.4xx' changes 2022-10-12 22:41:36 +00: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
dotnet-bot
24f86f2a44 Merge in 'release/6.0.3xx' changes 2022-10-12 21:25:39 +00: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-bot
32d6676c51 Merge in 'release/6.0.4xx' changes 2022-10-12 18:32:54 +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
Jason Zhai
0d31263c5b Merge branch 'release/6.0.3xx' into release/6.0.4xx 2022-10-12 00:13:19 -07:00
dotnet-bot
242c0b825d Merge in 'release/6.0.1xx' changes 2022-10-12 02:08:25 +00: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
dotnet-bot
370f0f78ba Merge in 'release/6.0.1xx' changes 2022-10-11 23:55:07 +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
dotnet-bot
4f2e801ec4 Merge in 'release/6.0.1xx' changes 2022-10-11 21:45:58 +00:00
Michael Simons
96efc2a855
[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
 2022-10-11 16:35:00 -05:00
dotnet-bot
6be4d652fd Merge in 'release/6.0.3xx' changes 2022-10-11 20:11:58 +00:00
Marc Paine
2d21c668bb
Merge pull request #14716 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-11 13:00:09 -07:00
dotnet-bot
5ffd39f5d4 Merge in 'release/6.0.1xx' changes 2022-10-11 18:54:35 +00:00
Chris Rummel
b389d53439
Add support for using --with-packages with smoke-tests. (#14387) (#14587) 
* Add support for using --with-packages with smoke-tests.

* Use a better variable name for custom packages directory.

* Swap conditions so we don't have to delete the archive directory.  Fixes https://github.com/dotnet/source-build/issues/2900.

* Update src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetHelper.cs

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

* Address review feedback.

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

Co-authored-by: Michael Simons <msimons@microsoft.com>
 2022-10-11 13:43:26 -05:00
dotnet-bot
8138c1ed15 Merge in 'release/6.0.1xx' changes 2022-10-11 17:35:20 +00:00
Marc Paine
f1161af25c
Merge pull request #14477 from ayakael/backports/pr-12516-to-release/6.0.1xx 
[release/6.0.1xx] GetRuntimeInformation.targets: determine PortableProductMonikerRid based on OSName and Architecture. (backports #12516)
 2022-10-11 10:24:07 -07:00
Sean Reeser
6d435f4d80 Merge commit '68624187969147694f78da1cc12444330b06fb1d' into internal-merge-6.0.4xx-2022-10-11-1011 2022-10-11 10:11:00 -07:00
Sean Reeser
7c180f0813 Merge commit 'de9a4b2f4b9f62cdf5b4a94cb66f9125e37b2a5c' into internal-merge-6.0.3xx-2022-10-11-1010 2022-10-11 10:10:52 -07:00
Sean Reeser
b263fe6a97 Merge commit 'ce0a42998a3d2a725f5bd08413b140d907f48177' into internal-merge-6.0.1xx-2022-10-11-1010 2022-10-11 10:10:43 -07:00