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

27742 commits

This branch
This branch
All branches
Author SHA1 Message Date
Forgind
96ddfa6596
[automated] Merge branch 'release/6.0.4xx' => 'release/7.0.1xx' (#16926) 2023-07-11 10:36:52 -07:00
Sean Reeser
0743ee8b28 Merge commit '3e9283a8e906761fcf9973c0007a75c0eb20baea' into internal-merge-7.0.1xx-2023-07-11-1023 2023-07-11 10:23:49 -07:00
Sean Reeser
272b39f66e Merge commit 'ee124f7fe1946ba82febd79ef25c3040de461d3a' into internal-merge-6.0.4xx-2023-07-11-1017 2023-07-11 10:17:06 -07:00
Sean Reeser
8ad8121e95 Merge commit '2282fe998c54635c744653971f1903f98a33d49b' into internal-merge-6.0.3xx-2023-07-11-1016 2023-07-11 10:16:57 -07:00
Sean Reeser
3ee1863ab0 Merge commit 'd63b17be66f766a5381950bce677884e4e3bb5b6' into internal-merge-6.0.1xx-2023-07-11-1016 2023-07-11 10:16:47 -07:00
Michael Simons
786df50860 Resolve source-build patch conflicts 2023-07-11 14:31:03 +00:00
Jason Zhai
1ee0b6e012 Merge branch 'release/6.0.4xx' into release/7.0.1xx 2023-07-11 00:45:34 -07:00
dotnet-bot
8a509cd255 Merge in 'release/6.0.4xx' changes 2023-07-10 17:36:13 +00:00
Forgind
de86f1f4cd
[automated] Merge branch 'release/6.0.3xx' => 'release/6.0.4xx' (#16914) 2023-07-10 10:27:21 -07:00
Matt Thalman
c5f29a611d Update format patch 2023-07-10 09:31:51 -05:00
Matt Thalman
65db63eb44 Update format patch 2023-07-10 08:06:04 -05:00
Jason Zhai
bf62ec46b4 Merge branch 'release/6.0.3xx' into release/6.0.4xx 2023-07-09 22:51:32 -07:00
dotnet-bot
eb79b57356 Merge in 'release/6.0.3xx' changes 2023-07-07 20:15:57 +00:00
dotnet-maestro-bot
fd5696554a
[automated] Merge branch 'release/6.0.1xx' => 'release/6.0.3xx' (#16898) 
Co-authored-by: Nikola Milosavljevic <nikolam@microsoft.com>
Co-authored-by: Sean Reeser <v-seanreeser@microsoft.com>
Co-authored-by: Marc Paine <marcpop@microsoft.com>
Co-authored-by: Matt Thalman <mthalman@microsoft.com>
 2023-07-07 13:07:58 -07:00
dotnet-bot
d25a6448f2 Merge in 'release/6.0.4xx' changes 2023-07-06 17:18:13 +00:00
dotnet-maestro-bot
7a0352f5fb
[automated] Merge branch 'release/6.0.3xx' => 'release/6.0.4xx' (#16891) 
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: v-wuzhai <46013274+v-wuzhai@users.noreply.github.com>
Co-authored-by: Jason Zhai <v-wuzhai@microsoft.com>
Co-authored-by: Noah Gilson <noahgilson@microsoft.com>
Co-authored-by: Sean Reeser <v-seanreeser@microsoft.com>
Co-authored-by: Marc Paine <marcpop@microsoft.com>
Co-authored-by: NET Source-Build Bot <102560831+dotnet-sb-bot@users.noreply.github.com>
Co-authored-by: Matt Thalman <mthalman@microsoft.com>
 2023-07-06 10:09:19 -07:00
dotnet-bot
827f0bbd97 Merge in 'release/6.0.1xx' changes 2023-07-06 13:46:46 +00:00
Matt Thalman
bd99c96e72
Include RID in SB artifact file names (#16855) 2023-07-06 08:40:35 -05:00
Matt Thalman
03d62bc222
Update SB SDK diff baseline for 6.0 (#16822) 2023-07-06 08:39:16 -05:00
dotnet-bot
715402ae02 Merge in 'release/6.0.3xx' changes 2023-07-06 02:20:13 +00:00
v-wuzhai
a2e9ed9df1
[automated] Merge branch 'release/6.0.1xx' => 'release/6.0.3xx' (#16797) 2023-07-05 19:12:24 -07:00
dotnet-bot
3108087dbb Merge in 'release/6.0.1xx' changes 2023-07-05 23:21:29 +00:00
Marc Paine
38091caf0e
Update branding to 6.0.121 (#16885) 2023-07-05 16:13:32 -07:00
dotnet-bot
3ee9391fd7 Merge in 'release/7.0.1xx' changes 2023-07-05 22:52:58 +00:00
dotnet-bot
6dca145f7a Merge in 'release/6.0.4xx' changes 2023-07-05 22:47:14 +00:00
Marc Paine
dae68bd9f7
Update branding to 7.0.110 (#16888) 2023-07-05 15:45:16 -07:00
Marc Paine
f3d7896093
Update branding to 6.0.413 (#16887) 2023-07-05 15:38:55 -07:00
dotnet-bot
6585821c9d Merge in 'release/6.0.3xx' changes 2023-07-05 22:21:01 +00:00
Marc Paine
59ad809023
Update branding to 6.0.316 (#16886) 2023-07-05 15:11:44 -07:00
Sean Reeser
369e1e683a Update branding to 7.0.110 2023-07-05 14:38:56 -07:00
Sean Reeser
c6222f0702 Update branding to 6.0.413 2023-07-05 14:38:50 -07:00
Sean Reeser
ab99c450a0 Update branding to 6.0.316 2023-07-05 14:38:44 -07:00
Sean Reeser
cd4682850c Update branding to 6.0.121 2023-07-05 14:38:38 -07:00
dotnet-bot
5bb829d08a Merge in 'release/6.0.1xx' changes 2023-06-28 17:38:51 +00:00
Nikola Milosavljevic
5bf1bb2bab
Fix System.Text.Json poison instances (#16826) 2023-06-28 10:29:15 -07:00
Jason Zhai
3fbd26591e Merge branch 'release/6.0.1xx' into release/6.0.3xx 2023-06-24 22:42:40 -07:00
dotnet-bot
d63b17be66 Merge in 'release/6.0.1xx' changes 2023-06-23 18:40:24 +00:00
Matt Thalman
1aeb92395a
Fix SDK version of source-build global.json (#16798) 2023-06-23 18:31:22 +00:00
Matt Thalman
3949e52fdd Merged PR 32214: .NET Source-Build 7.0.108 June 2023 OOB Updates 
update global.json and Versions.props for .NET SDK 7.0.108
 2023-06-23 17:44:47 +00:00
dotnet-bot
3e9283a8e9 Merge in 'release/7.0.1xx' changes 2023-06-23 17:36:23 +00:00
Matt Thalman
c255b45852
.NET Source-Build 7.0.108 June 2023 OOB Updates (#16795) 2023-06-23 17:27:37 +00:00
dotnet-bot
723d5b09c3 Merge in 'release/6.0.1xx' changes 2023-06-23 14:36:28 +00:00
NET Source-Build Bot
8f7ebafe7b
.NET Source-Build 6.0.118 June 2023 Updates (#16670) 2023-06-23 14:27:22 +00:00
DotNet Bot
a975c9588d Merged PR 32191: [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**: 20230622.18
- **Date Produced**: June 22, 2023 7:43:04 PM UTC
- **Commit**: 2b3241fd09fe88b953a4fca6b8e79fa7e993c488
- **Branch**: refs/heads/internal/release/7.0.1xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.109 to 7.0.109][1]
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.109-servicing.23322.6 to 7.0.109-servicing.23322.18][1]
  - **Microsoft.NET.Sdk**: [from 7.0.109-servicing.23322.6 to 7.0.109-servicing.23322.18][1]
  - **Microsoft.TemplateEngine.Cli**: [from 7.0.109-servicing.23322.6 to 7.0.109-servicing.23322.18][1]

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

[DependencyUpdate]: <> (End)

[marker]: <> (End:65272799-fe4d-4dbf-f0fe-08da7ef63651)
 2023-06-23 00:24:11 +00:00
DotNet Bot
ee124f7fe1 Merged PR 32190: [internal/release/6.0.4xx] Update dependencies from dnceng/internal/dotnet-sdk 
This pull request updates the following dependencies

[marker]: <> (Begin:a27c2ce2-aedf-42b7-d31e-08da6571bd31)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- **Subscription**: a27c2ce2-aedf-42b7-d31e-08da6571bd31
- **Build**: 20230622.15
- **Date Produced**: June 22, 2023 7:18:20 PM UTC
- **Commit**: 6a49236d0540364ac6e9f81a7ea637c06b17d88e
- **Branch**: refs/heads/internal/release/6.0.4xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.412-servicing.23322.4 to 6.0.412-servicing.23322.15][1]
  - **Microsoft.NET.Sdk**: [from 6.0.412-servicing.23322.4 to 6.0.412-servicing.23322.15][1]

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

[DependencyUpdate]: <> (End)

[marker]: <> (End:a27c2ce2-aedf-42b7-d31e-08da6571bd31)
 2023-06-23 00:23:54 +00:00
DotNet Bot
2282fe998c Merged PR 32189: [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**: 20230622.16
- **Date Produced**: June 22, 2023 7:18:04 PM UTC
- **Commit**: b9359aebf07bec085619421d7b078affadbd4b05
- **Branch**: refs/heads/internal/release/6.0.3xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.315-servicing.23322.9 to 6.0.315-servicing.23322.16][1]
  - **Microsoft.NET.Sdk**: [from 6.0.315-servicing.23322.9 to 6.0.315-servicing.23322.16][1]

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

[DependencyUpdate]: <> (End)

[marker]: <> (End:b5bca336-8d99-407e-c145-08d9d60066b9)
 2023-06-23 00:23:50 +00:00
DotNet Bot
1a7b8a9978 Merged PR 32188: [internal/release/6.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk 
This pull request updates the following dependencies

[marker]: <> (Begin:a68e208b-7b40-4a19-af8d-08d961c59698)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- **Subscription**: a68e208b-7b40-4a19-af8d-08d961c59698
- **Build**: 20230622.14
- **Date Produced**: June 22, 2023 7:16:04 PM UTC
- **Commit**: 1f82b9fbd6d2ed0076ed2ea733330ba98130a109
- **Branch**: refs/heads/internal/release/6.0.1xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.120-servicing.23322.3 to 6.0.120-servicing.23322.14][1]
  - **Microsoft.NET.Sdk**: [from 6.0.120-servicing.23322.3 to 6.0.120-servicing.23322.14][1]

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

[DependencyUpdate]: <> (End)

[marker]: <> (End:a68e208b-7b40-4a19-af8d-08d961c59698)
 2023-06-23 00:23:46 +00:00
Matt Thalman
47aeefdcc0 Merged PR 32193: Set OmniSharp run script to be executable 
Backport of https://github.com/dotnet/installer/pull/16772 but had to be modified due to lack of API support in 6.0.
 2023-06-22 22:18:15 +00:00
Matt Thalman
1dbbc52520 Merged PR 32192: Set OmniSharp run script to be executable 
Backport of https://github.com/dotnet/installer/pull/16772
 2023-06-22 22:11:11 +00:00
DotNet Bot
14e7d3c0b1 Merged PR 32179: [internal/release/6.0.3xx] Update dependencies from dnceng/internal/dotnet-sdk 
This pull request updates the following dependencies

[marker]: <> (Begin:Coherency Updates)
## Coherency Updates

The following updates ensure that dependencies with a *CoherentParentDependency*
attribute were produced in a build used as input to the parent dependency's build.
See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview)

[DependencyUpdate]: <> (Begin)

- **Coherency Updates**:
  - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.315 to 6.0.315 (parent: Microsoft.NET.Sdk)
  - **Microsoft.TemplateEngine.Cli**: from 6.0.315-servicing.23320.9 to 6.0.315-servicing.23322.5 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.315 to 6.0.315 (parent: Microsoft.NET.Sdk)

[DependencyUpdate]: <> (End)

[marker]: <> (End:Coherency Updates)

[marker]: <> (Begin:b5bca336-8d99-407e-c145-08d9d60066b9)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- **Subscription**: b5bca336-8d99-407e-c145-08d9d60066b9
- **Build**: 20230622.9
- **Date Produced**: June 22, 2023 5:52:42 PM UTC
- **Commit**: 326d33693c0fc67483ad0da850d5f36ea5a078e8
- **Branch**: refs/heads/internal/release/6.0.3xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.315-servicing.23321.37 to 6.0.315-servicing.23322.9][1]
  - **Microsoft.NET.Sdk**: [from 6.0.315-servicing.23321.37 to 6.0.315-servicing.23322.9][1]
  - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.315 to 6.0.315][2]
  - **Microsoft.TemplateEngine.Cli**: [from 6.0.315-servicing.23320.9 to 6.0.315-servicing.23322.5][2]
  - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: [from 6.0.315 to 6.0.315][2]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC942c2e51b7&targetVersion=GC326d33693c&_a=files
[2]: https://dev.azure.com/dnceng/internal/_git/dotnet-templating/branches?baseVersion=GCe058a95e92&targetVersion=GC3a75313bb4&_a=files

[DependencyUpdate]: <> (End)

[marker]: <> (End:b5bca336-8d99-407e-c145-08d9d60066b9)
 2023-06-22 18:34:47 +00:00