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

24359 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
DotNet-Bot
534d512b43 Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20221010.34 
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.305-servicing.22476.47 -> To Version 6.0.306-servicing.22510.34
 2022-10-11 06:15:30 +00:00
DotNet-Bot
0fa6d987c6 Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20221010.22 
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.305-servicing.22476.47 -> To Version 6.0.305-servicing.22510.22
 2022-10-11 01:07:10 +00:00
dotnet-bot
03ca8c17e1 Merge in 'release/6.0.3xx' changes 2022-10-06 21:35:16 +00:00
Marc Paine
b59603856b
Merge pull request #14671 from dotnet/marcpopMSFT-fixemsdkhash 
Fix emsdk hash
 2022-10-06 14:24:39 -07:00
dotnet-bot
c89c9b1f85 Merge in 'release/6.0.4xx' changes 2022-10-05 22:36:43 +00:00
Marc Paine
06b150f716
Merge pull request #14667 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-05 15:25:20 -07:00
Marc Paine
88bc331e88
Fix emsdk hash 
I noticed in the codeflow from 3xx to 4xx that the hash got messed up in the process and set to the 6.0.9 one. We don't believe the version needs to be updated but the hashes should match so reverting this.
 2022-10-05 14:45:05 -07:00
Marc Paine
ff52e56145
Revert emsdk hash 2022-10-05 14:43:28 -07:00
Marc Paine
b779db552d
Merge branch 'release/6.0.4xx' into merge/release/6.0.3xx-to-release/6.0.4xx 2022-10-05 11:50:00 -07:00
dotnet-bot
4be58903c8 Merge in 'release/6.0.3xx' changes 2022-10-05 17:32:28 +00:00
Marc Paine
d1a0d6bb62
Merge pull request #14659 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-05 10:16:46 -07:00
Marc Paine
fd7ea35f90 Merge branch 'merge/release/6.0.1xx-to-release/6.0.3xx' of https://github.com/dotnet-maestro-bot/core-sdk into merge/release/6.0.1xx-to-release/6.0.3xx 2022-10-04 15:48:00 -07:00
dotnet-bot
1b7c8b4543 Merge in 'release/6.0.1xx' changes 2022-10-04 18:31:52 +00:00
dotnet-bot
912d959224 Merge in 'release/6.0.3xx' changes 2022-10-04 18:30:23 +00:00
dotnet-bot
5debb8747e Merge in 'release/6.0.4xx' changes 2022-10-04 18:29:47 +00:00
Marc Paine
c0718ca0ae
Merge pull request #14603 from dotnet/Jason/UpdateImagesFor601xx 
Update windows images for release/6.0.1xx
 2022-10-04 11:22:19 -07:00
Marc Paine
a7dfb6260f
Merge pull request #14654 from vseanreesermsft/branding-6.0.111-2022-10-04-0937 
Update branding to 6.0.111
 2022-10-04 11:20:05 -07:00
Marc Paine
9944284877
Merge pull request #14655 from vseanreesermsft/branding-6.0.306-2022-10-04-0937 
Update branding to 6.0.306
 2022-10-04 11:19:55 -07:00
Marc Paine
9d749467a5
Merge pull request #14656 from vseanreesermsft/branding-6.0.403-2022-10-04-0937 
Update branding to 6.0.403
 2022-10-04 11:19:44 -07:00
Sean Reeser
19a9961977 Update branding to 6.0.403 2022-10-04 09:37:55 -07:00
Sean Reeser
ba1239dfc7 Update branding to 6.0.306 2022-10-04 09:37:50 -07:00