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

27172 commits

This branch
This branch
All branches
Author SHA1 Message Date
Michael Simons
d454057851
Merge branch 'release/6.0.3xx' into merge/release/6.0.1xx-to-release/6.0.3xx 2022-11-07 17:18:24 -06:00
Michael Simons
e58b4b582e
Update triggers to prevent tarball CI from running on 6.0.3xx and 6.0.4xx (#14896) 2022-11-07 17:16:37 -06:00
Marc Paine
fdd0b18d83
Merge branch 'release/7.0.1xx' into marcpopMSFT-fixtelemetrytestversion 2022-11-06 20:44:09 -08:00
dotnet-bot
a23591fe4c Merge in 'release/7.0.1xx' changes 2022-11-07 02:33:38 +00:00
v-wuzhai
d7cafddd86
Merge pull request #14891 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-11-06 18:22:25 -08:00
Marc Paine
ccd4c9b0e2 Fix build error. 2022-11-05 15:13:09 -07:00
Marc Paine
89758ef046 Get the telemetry version from the --version command and use it to find dotnet.dll 2022-11-04 22:55:00 -07:00
Marc Paine
6e5661babc
Quick fix to unblock codeflow while I investigate further 2022-11-04 16:50:32 -07:00
DotNet-Bot
cceb839e95 Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20221104.17 
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.111-servicing.22523.21 -> To Version 6.0.112-servicing.22554.17
 2022-11-04 23:43:57 +00:00
Michael Simons
081ee69e53
Refactor source-build CI triggers and pools (#14835) (#14878) 2022-11-04 12:04:36 -05:00
Jason Zhai
8f3c970895 Merge branch 'release/6.0.4xx' into release/7.0.1xx 2022-11-04 01:08:53 -07:00
dotnet-bot
4677e5b50e Merge in 'release/6.0.4xx' changes 2022-11-04 06:02:39 +00:00
Marc Paine
72553f8783
Merge pull request #14889 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-11-03 22:51:23 -07:00
dotnet-bot
43de9f5630 Merge in 'release/6.0.4xx' changes 2022-11-03 23:02:09 +00:00
Marc Paine
7ad7e5f37f
Merge pull request #14836 from joeloff/finalizer2 
Ensure finalizer only runs when no matching SDK feature bands are installed
 2022-11-03 15:51:28 -07:00
Marc Paine
15aec658a5
Merge branch 'release/6.0.4xx' into merge/release/6.0.3xx-to-release/6.0.4xx 2022-11-03 13:22:52 -07:00
dotnet-bot
4709d6d99e Merge in 'release/6.0.3xx' changes 2022-11-03 18:20:46 +00:00
Marc Paine
05ccc0e989
Merge pull request #14876 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-11-03 11:08:03 -07:00
dotnet-bot
e9a2693bcd Merge in 'release/6.0.4xx' changes 2022-11-03 05:41:16 +00:00
v-wuzhai
8f60659f0a
Merge pull request #14874 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-11-02 22:27:54 -07:00
Jason Zhai
f3f7fb6c5d Merge branch 'release/6.0.1xx' into release/6.0.3xx 2022-11-02 22:26:15 -07:00
DotNet-Bot
3c46d4c77d Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20221102.20 
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.111-servicing.22523.21 -> To Version 6.0.112-servicing.22552.20
 2022-11-02 19:11:01 +00:00
Marc Paine
2db6be3b19
Merge pull request #14830 from dotnet/marcpopMSFT-codeql 
Enable codeql
 2022-11-02 10:21:22 -07:00
Marc Paine
3b90baa8fe
Merge pull request #14829 from dotnet/marcpopMSFT-final3.1build 
Fix to final 3.1 build
 2022-11-02 10:21:14 -07:00
dotnet-bot
d0835b5784 Merge in 'release/6.0.4xx' changes 2022-11-02 09:47:36 +00:00
dotnet-bot
f0345b0326 Merge in 'release/6.0.3xx' changes 2022-11-02 09:46:05 +00:00
v-wuzhai
b1cf660853
Merge pull request #14869 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-11-02 02:35:38 -07:00
v-wuzhai
25f95ab488
Merge pull request #14872 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-11-02 02:35:11 -07:00
Jason Zhai
222fcbdbbe Merge branch 'release/6.0.3xx' into release/6.0.4xx 2022-11-01 23:05:21 -07:00
Jason Zhai
62d4355934 Merge branch 'release/6.0.1xx' into release/6.0.3xx 2022-11-01 22:45:14 -07:00
DotNet-Bot
42209bc6ca Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20221101.15 
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.111-servicing.22523.21 -> To Version 6.0.112-servicing.22551.15
 2022-11-02 01:13:09 +00:00
DotNet Bot
7b91da9144 Merged PR 27044: [internal/release/7.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk 
This pull request updates the following dependencies

[marker]: <> (Begin:65272799-fe4d-4dbf-f0fe-08da7ef63651)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- **Subscription**: 65272799-fe4d-4dbf-f0fe-08da7ef63651
- **Build**: 20221025.10
- **Date Produced**: October 26, 2022 4:35:49 AM UTC
- **Commit**: 86457a8ee126653ca38a5330a68e380a1da158e8
- **Branch**: refs/heads/internal/release/7.0.1xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.100 to 7.0.100][1]
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.100-rtm.22521.7 to 7.0.100-rtm.22525.10][1]
  - **Microsoft.NET.Sdk**: [from 7.0.100-rtm.22521.7 to 7.0.100-rtm.22525.10][1]
  - **Microsoft.TemplateEngine.Cli**: [from 7.0.100-rtm.22521.7 to 7.0.100-rtm.22525.10][1]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC882a576&targetVersion=GC86457a8&_a=files

[DependencyUpdate]: <> (End)

[marker]: <> (End:65272799-fe4d-4dbf-f0fe-08da7ef63651)
 2022-11-01 23:41:17 +00:00
dotnet-bot
4b14efe768 Merge in 'release/7.0.1xx' changes 2022-11-01 23:12:56 +00:00
Marc Paine
973f1e7ffa
Merge pull request #14865 from vseanreesermsft/branding-6.0.112-2022-11-01-1417 
Update branding to 6.0.112
 2022-11-01 16:08:36 -07:00
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
dotnet-bot
c2237c37c0 Merge in 'release/6.0.4xx' changes 2022-11-01 22:43:36 +00:00
dotnet-bot
d1ad494383 Merge in 'release/6.0.3xx' changes 2022-11-01 22:43:04 +00:00
Marc Paine
45c95da80c
Merge pull request #14867 from vseanreesermsft/branding-6.0.404-2022-11-01-1417 
Update branding to 6.0.404
 2022-11-01 15:32:42 -07:00
Marc Paine
2a488056d0
Merge pull request #14866 from vseanreesermsft/branding-6.0.307-2022-11-01-1417 
Update branding to 6.0.307
 2022-11-01 15:32:31 -07:00
dotnet-bot
d56449ffa4 Merge in 'release/7.0.1xx' changes 2022-11-01 22:05:59 +00: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
Sean Reeser
c7fe18c3f8 Update branding to 6.0.404 2022-11-01 14:17:48 -07:00
Sean Reeser
8ffa10fe47 Update branding to 6.0.307 2022-11-01 14:17:44 -07:00
Sean Reeser
55ad445024 Update branding to 6.0.112 2022-11-01 14:17:40 -07:00
Marc Paine
3f43116264
Update Versions.props 2022-11-01 10:24:46 -07:00
dotnet-bot
7fdf4794ae Merge in 'release/7.0.1xx' changes 2022-10-31 14:21:14 +00: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
dotnet-bot
8a7526cfe0 Merge in 'release/7.0.1xx' changes 2022-10-27 18:59:38 +00: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