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

24640 commits

This branch
This branch
All branches
Author SHA1 Message Date
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-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-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
v-wuzhai
a2e9ed9df1
[automated] Merge branch 'release/6.0.1xx' => 'release/6.0.3xx' (#16797) 2023-07-05 19:12:24 -07:00
Marc Paine
f3d7896093
Update branding to 6.0.413 (#16887) 2023-07-05 15:38:55 -07:00
Marc Paine
59ad809023
Update branding to 6.0.316 (#16886) 2023-07-05 15:11:44 -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
Jason Zhai
3fbd26591e Merge branch 'release/6.0.1xx' into release/6.0.3xx 2023-06-24 22:42:40 -07:00
Matt Thalman
1aeb92395a
Fix SDK version of source-build global.json (#16798) 2023-06-23 18:31:22 +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
Marc Paine
220626aee9
Update branding to 6.0.120 (#16736) 2023-06-19 13:20:08 -07:00
Marc Paine
4d8f58d0a3
Update branding to 6.0.315 (#16737) 2023-06-19 13:20:06 -07:00
Marc Paine
b350e37726
Update branding to 6.0.412 (#16738) 2023-06-19 13:20:04 -07:00
Sean Reeser
4359922858 Update branding to 6.0.412 2023-06-19 10:36:43 -07:00
Sean Reeser
7ffe202ef6 Update branding to 6.0.315 2023-06-19 10:36:37 -07:00
Sean Reeser
2c285f563a Update branding to 6.0.120 2023-06-19 10:36:32 -07:00
Noah Gilson
e0d106f081
[automated] Merge branch 'release/6.0.3xx' => 'release/6.0.4xx' (#16695) 2023-06-16 10:58:42 -07:00
Noah Gilson
296c45e5f4
[automated] Merge branch 'release/6.0.1xx' => 'release/6.0.3xx' (#16707) 2023-06-16 10:57:39 -07:00
Jason Zhai
078d557112 Fix the build errors 2023-06-15 22:31:35 -07:00
Jason Zhai
bb531ffeab Merge branch 'release/6.0.3xx' into release/6.0.4xx 2023-06-15 22:27:02 -07:00
Jason Zhai
d04344ab77 Merge branch 'release/6.0.1xx' into release/6.0.3xx 2023-06-15 20:09:53 -07:00
v-wuzhai
f036db2064
[release/6.0.4xx] Update dependencies from dotnet/arcade (#16697) 2023-06-15 19:52:16 -07:00
v-wuzhai
eedbfe2829
[release/6.0.1xx] Update dependencies from dotnet/arcade (#16700) 2023-06-15 19:50:35 -07:00
dotnet-maestro[bot]
5dd4806718 Update dependencies from https://github.com/dotnet/arcade build 20230613.5 
Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk
 From Version 6.0.0-beta.23211.7 -> To Version 6.0.0-beta.23313.5
 2023-06-15 21:19:12 +00:00
dotnet-maestro[bot]
298f1196d1 Update dependencies from https://github.com/dotnet/arcade build 20230613.5 
Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk
 From Version 6.0.0-beta.23211.7 -> To Version 6.0.0-beta.23313.5
 2023-06-15 20:46:29 +00:00
Marc Paine
c46292b0fb
[automated] Merge branch 'release/6.0.1xx' => 'release/6.0.3xx' (#16677) 2023-06-15 13:24:54 -07:00
Marc Paine
fae9cf2b3c
Merge branch 'release/6.0.3xx' into merge/release/6.0.1xx-to-release/6.0.3xx 2023-06-14 12:51:33 -07:00
Marc Paine
f5e0cb3a81
Merging internal commits for release/6.0.4xx (#16653) 2023-06-14 10:12:37 -07:00
Marc Paine
811412e5b2
Merging internal commits for release/6.0.3xx (#16652) 2023-06-14 10:12:33 -07:00
Marc Paine
d2b2e7974f
Merging internal commits for release/6.0.1xx (#16651) 2023-06-14 10:12:31 -07:00
Marc Paine
4165f029f0
[release/6.0.1xx] Update Windows SDK projection (#16656) 2023-06-13 13:04:27 -07:00
Marc Paine
56a8be417e
[release/6.0.4xx] Update Windows SDK projection (#16658) 2023-06-13 12:26:13 -07:00
Marc Paine
15435505e3
[release/6.0.3xx] Update Windows SDK projection (#16657) 2023-06-13 12:21:14 -07:00
Manodasan Wignarajah
c9f58f8391
Update Windows SDK projection 2023-06-13 11:26:29 -07:00
Manodasan Wignarajah
806ef9c26b
Update ManualVersions.props 2023-06-13 11:24:53 -07:00
Manodasan Wignarajah
f671b74651
Update ManualVersions.props 2023-06-13 11:22:54 -07:00
Sean Reeser
98d0bd76ee Merge commit '28c7c894a3' into internal-merge-6.0.4xx-2023-06-13-1011 2023-06-13 10:11:08 -07:00
Sean Reeser
f775ed6b1b Merge commit '4985279bcb' into internal-merge-6.0.3xx-2023-06-13-1010 2023-06-13 10:10:59 -07:00
Sean Reeser
5de38c5c12 Merge commit 'b8b476fbe6' into internal-merge-6.0.1xx-2023-06-13-1010 2023-06-13 10:10:49 -07:00
Marc Paine
34f576b409
Update branding to 6.0.119 (#16597) 2023-06-06 15:56:24 -07:00
Marc Paine
50088f9de5
Update branding to 6.0.411 (#16599) 2023-06-06 14:26:42 -07:00
Marc Paine
87af70871e
Update branding to 6.0.314 (#16598) 2023-06-06 14:26:32 -07:00
Sean Reeser
35376d26f1 Update branding to 6.0.411 2023-06-06 13:10:53 -07:00
Sean Reeser
c9406fa27b Update branding to 6.0.314 2023-06-06 13:10:49 -07:00
Sean Reeser
7cbeda80a9 Update branding to 6.0.119 2023-06-06 13:10:45 -07:00
DotNet Bot
28c7c894a3 Merged PR 31474: [internal/release/6.0.4xx] 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.410 to 6.0.410 (parent: Microsoft.NET.Sdk)
  - **Microsoft.TemplateEngine.Cli**: from 6.0.410-rtm.23261.12 to 6.0.410-rtm.23272.7 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.410 to 6.0.410 (parent: Microsoft.NET.Sdk)

[DependencyUpdate]: <> (End)

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

[marker]: <> (Begin:a27c2ce2-aedf-42b7-d31e-08da6571bd31)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- **Subscription**: a27c2ce2-aedf-42b7-d31e-08da6571bd31
- **Build**: 20230522.38
- **Date Produced**: May 22, 2023 11:21:44 PM UTC
- **Commit**: 3936afb953219ad1e565eca91e78f32e906d19f9
- **Branch**: refs/heads/internal/release/6.0.4xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.410-servicing.23272.31 to 6.0.410-servicing.23272.38][1]
  - **Microsoft.NET.Sdk**: [from 6.0.410-servicing.23272.31 to 6.0.410-servicing.23272.38][1]
  - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.410 to 6.0.410][2]
  - **Microsoft.TemplateEngine.Cli**: [from 6.0.410-rtm.23261.12 to 6.0.410-rtm.23272.7][2]
  - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: [from 6.0.410 to 6.0.410][2]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC9edbc4da0c&targetVersion=GC3936afb953&_a=files
[2]: https://dev.azure.com/dnceng/internal/_git/dotnet-templating/branches?baseVersion=GC85e4c28245&targetVersion=GC9cd9762fb7&_a=files

[DependencyUpdate]: <> (End)

[marker]: <> (End:a27c2ce2-aedf-42b7-d31e-08da6571bd31)
 2023-05-22 23:53:24 +00:00
DotNet Bot
02627d94e2 Merged PR 31468: [internal/release/6.0.4xx] 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.WindowsDesktop.App.Ref**: from 6.0.18 to 6.0.18 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.18-servicing.23269.7 to 6.0.18-servicing.23272.2 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.18-servicing.23269.7 to 6.0.18-servicing.23272.2 (parent: Microsoft.NET.Sdk)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.18 to 6.0.18 (parent: Microsoft.NET.Sdk)
  - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.18-servicing.23268.8 to 6.0.18-servicing.23272.1 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.18 to 6.0.18 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.18-servicing.23269.6 to 6.0.18-servicing.23272.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)

[DependencyUpdate]: <> (End)

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

[marker]: <> (Begin:a27c2ce2-aedf-42b7-d31e-08da6571bd31)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- **Subscription**: a27c2ce2-aedf-42b7-d31e-08da6571bd31
- **Build**: 20230522.31
- **Date Produced**: May 22, 2023 9:58:29 PM UTC
- **Commit**: 9edbc4da0c5288d32b998064289b5c548e389253
- **Branch**: refs/heads/internal/release/6.0.4xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.410-servicing.23272.27 to 6.0.410-servicing.23272.31][1]
  - **Microsoft.NET.Sdk**: [from 6.0.410-servicing.23272.27 to 6.0.410-servicing.23272.31][1]
  - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.18 to 6.0.18][2]
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.18-servicing.23269.7 to 6.0.18-servicing.23272.2][2]
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: [from 6.0.18-servicing.23269.7 to 6.0.18-servicing.23272.2][2]
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.18 to 6.0.18][2]
  - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.18-servicing.23268.8 to 6.0.18-servicing.23272.1][3]
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.18 to 6.0.18][2]
  - **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 6.0.18-servicing.23269.6 to 6.0.18-servicing.23272.2][4]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCdfaebbad22&targetVersion=GC9edbc4da0c&_a=files
[2]: https://d...
 2023-05-22 22:23:16 +00:00
DotNet Bot
4985279bcb Merged PR 31467: [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.WindowsDesktop.App.Ref**: from 6.0.18 to 6.0.18 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.18-servicing.23269.7 to 6.0.18-servicing.23272.2 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.18-servicing.23269.7 to 6.0.18-servicing.23272.2 (parent: Microsoft.NET.Sdk)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.18 to 6.0.18 (parent: Microsoft.NET.Sdk)
  - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.18-servicing.23268.8 to 6.0.18-servicing.23272.1 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.18 to 6.0.18 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.18-servicing.23269.6 to 6.0.18-servicing.23272.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)

[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**: 20230522.30
- **Date Produced**: May 22, 2023 9:52:42 PM UTC
- **Commit**: 0916fe56744d1c533e4a15aaa7293e6fa7b92b99
- **Branch**: refs/heads/internal/release/6.0.3xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.313-servicing.23272.16 to 6.0.313-servicing.23272.30][1]
  - **Microsoft.NET.Sdk**: [from 6.0.313-servicing.23272.16 to 6.0.313-servicing.23272.30][1]
  - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.18 to 6.0.18][2]
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.18-servicing.23269.7 to 6.0.18-servicing.23272.2][2]
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: [from 6.0.18-servicing.23269.7 to 6.0.18-servicing.23272.2][2]
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.18 to 6.0.18][2]
  - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.18-servicing.23268.8 to 6.0.18-servicing.23272.1][3]
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.18 to 6.0.18][2]
  - **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 6.0.18-servicing.23269.6 to 6.0.18-servicing.23272.2][4]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC2d505333fd&targetVersion=GC0916fe5674&_a=files
[2]: https://d...
 2023-05-22 22:23:11 +00:00