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

28376 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jason Zhai
2d56bb8119 Merge branch 'release/6.0.4xx' into release/7.0.1xx 2024-04-10 22:45:00 -07:00
Michael Yanni
2747184d8d
[release/6.0.4xx] Update dependencies from dotnet/arcade (#19422) 2024-04-10 14:55:51 -07:00
Michael Yanni
53e0a410eb
[release/7.0.1xx] Update dependencies from dotnet/arcade (#19411) 2024-04-10 13:46:12 -07:00
Matt Thalman
436da5e6bb
Update SB SDK diff baseline (#19413) 2024-04-10 20:13:07 +00:00
dotnet-maestro[bot]
fbfea7c0c3 Update dependencies from https://github.com/dotnet/arcade build 20240404.4 
Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk
 From Version 6.0.0-beta.24176.9 -> To Version 6.0.0-beta.24204.4
 2024-04-10 18:00:04 +00:00
dotnet-maestro[bot]
d18629dc95 Update dependencies from https://github.com/dotnet/arcade build 20240409.2 
Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk
 From Version 7.0.0-beta.24176.7 -> To Version 7.0.0-beta.24209.2
 2024-04-10 17:10:07 +00:00
Oleksandr Didyk
a0c84133de
.NET Source-Build 7.0.118 April 2024 Updates (#19381) 2024-04-10 11:35:18 +02:00
Michael Yanni
1a9770c225
Merging internal commits for release/7.0.1xx (#19378) 2024-04-09 14:51:41 -07:00
Michael Yanni
a5a242b3a9
Merging internal commits for release/6.0.4xx (#19374) 2024-04-09 14:51:00 -07:00
dotnet-sb-bot
2df25924d7 update global.json and Versions.props for .NET SDK 7.0.118 2024-04-09 20:12:09 +00:00
Sean Reeser
9ea370eaaa Merge commit 'ef7589b476034bb95ccba0abe6c9fc05d20ecf6f' into internal-merge-7.0.1xx-2024-04-09-1227 2024-04-09 12:27:15 -07:00
Sean Reeser
5532cc99d6 Merge commit '04f27549cdbdcb0d6784037693769c93ed1de787' into internal-merge-6.0.4xx-2024-04-09-1222 2024-04-09 12:22:24 -07:00
v-wuzhai
92c8d58053
[automated] Merge branch 'release/6.0.4xx' => 'release/7.0.1xx' (#19295) 2024-04-07 22:40:16 -07:00
Jason Zhai
0ba027e471 Merge branch 'release/6.0.4xx' into release/7.0.1xx 2024-04-07 19:41:44 -07:00
Marc Paine
d7b3353516
Rewrite testhost.json (#19320) 2024-04-05 13:12:40 -07:00
Jakub Jareš
8f232fb8af
Merge branch 'release/6.0.4xx' into fix-newtonsoft-in-deps-6-0-4xx 2024-04-05 12:56:20 +02:00
Jakub Jareš
6bc4c2adf8 Rewrite testhost.json 2024-04-05 12:52:51 +02:00
Forgind
07e0cabba2
[automated] Merge branch 'release/6.0.1xx' => 'release/6.0.4xx' (#19280) 2024-04-03 09:41:12 -07:00
Forgind
4a916161c3
[automated] Merge branch 'release/6.0.4xx' => 'release/7.0.1xx' (#19276) 2024-04-03 09:40:09 -07:00
Jason Zhai
e88331d359 Merge branch 'release/6.0.4xx' into release/7.0.1xx 2024-04-02 19:44:41 -07:00
Jason Zhai
3350fd06f2 Merge branch 'release/6.0.1xx' into release/6.0.4xx 2024-04-02 19:41:35 -07:00
Forgind
df8d48bce0
[automated] Merge branch 'release/6.0.1xx' => 'release/6.0.4xx' (#18970) 2024-04-02 15:08:32 -07:00
Michael Yanni
4308c39b28
[6.0.1xx] Migrate to 1ES templates for internal builds (#19130) 
Co-authored-by: Matt Thalman <mthalman@microsoft.com>
 2024-04-02 15:07:15 -07:00
dotnet-maestro[bot]
59b9f4ee08
[release/6.0.4xx] Update dependencies from dotnet/source-build-reference-packages (#19149) 
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
 2024-04-02 15:06:58 -07:00
dotnet-maestro[bot]
8c3184079c
[release/6.0.1xx] Update dependencies from dotnet/source-build-reference-packages (#19150) 
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
 2024-04-02 15:06:10 -07:00
dotnet-maestro[bot]
cd1c903806
[release/7.0.1xx] Update dependencies from dotnet/source-build-externals (#19162) 
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
 2024-04-02 15:05:48 -07:00
dotnet-maestro[bot]
d8d99de386
[release/7.0.1xx] Update dependencies from dotnet/source-build-reference-packages (#19153) 
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
 2024-04-02 15:04:32 -07:00
v-wuzhai
ee8c8a8d63
[release/6.0.1xx] Remove 2.1-5.0 templates (#19236) 2024-04-02 15:04:10 -07:00
v-wuzhai
cded9907f2
[release/7.0.1xx] Remove 2.1-5.0 templates (#19237) 2024-04-02 15:03:59 -07:00
Michael Yanni
7696697e0d
[6.0.4xx] Migrate to 1ES templates for internal builds (#19187) 
Co-authored-by: Matt Thalman <mthalman@microsoft.com>
 2024-04-02 15:03:37 -07:00
Michael Yanni
689d2d7021
[7.0.1xx] Migrate to 1ES templates for internal builds (#19188) 
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Matt Thalman <mthalman@microsoft.com>
 2024-04-02 15:03:19 -07:00
Marc Paine
362dca36b1
[release/7.0.1xx] Update dependencies from dotnet/arcade (#19133) 2024-04-02 14:41:30 -07:00
Marc Paine
f8245c9bee
[release/6.0.1xx] Update dependencies from dotnet/arcade (#19256) 2024-04-02 14:40:28 -07:00
Marc Paine
cadad63f21
[release/6.0.4xx] Update dependencies from dotnet/arcade (#19254) 2024-04-02 14:40:25 -07:00
Marc Paine
75fc928c36
Update branding to 7.0.119 (#19271) 2024-04-02 14:39:02 -07:00
Marc Paine
4eb2b30db4
Update branding to 6.0.422 (#19270) 2024-04-02 14:38:59 -07:00
Marc Paine
9ad02d27ea
Update branding to 6.0.130 (#19269) 2024-04-02 14:38:56 -07:00
Sean Reeser
06b037aefb Update branding to 7.0.119 2024-04-02 11:55:45 -07:00
Sean Reeser
71acbd380f Update branding to 6.0.422 2024-04-02 11:55:40 -07:00
Sean Reeser
6ec2902bf9 Update branding to 6.0.130 2024-04-02 11:55:35 -07:00
dotnet-maestro[bot]
d30a98c1f7 Update dependencies from https://github.com/dotnet/arcade build 20240326.9 
Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk
 From Version 6.0.0-beta.24163.13 -> To Version 6.0.0-beta.24176.9
 2024-04-01 22:19:12 +00:00
dotnet-maestro[bot]
a07cb5e274 Update dependencies from https://github.com/dotnet/arcade build 20240326.9 
Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk
 From Version 6.0.0-beta.24163.13 -> To Version 6.0.0-beta.24176.9
 2024-04-01 22:19:05 +00:00
dotnet-maestro[bot]
e7c3e52404 Update dependencies from https://github.com/dotnet/arcade build 20240326.7 
Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk
 From Version 7.0.0-beta.24114.4 -> To Version 7.0.0-beta.24176.7
 2024-04-01 22:19:03 +00:00
DotNet Bot
04f27549cd Merged PR 38480: [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.29 to 6.0.29 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.29-servicing.24169.26 to 6.0.29-servicing.24171.9 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.29-servicing.24169.26 to 6.0.29-servicing.24171.9 (parent: Microsoft.NET.Sdk)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.29 to 6.0.29 (parent: Microsoft.NET.Sdk)
  - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.29-servicing.24169.15 to 6.0.29-servicing.24171.6 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.29 to 6.0.29 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.29-servicing.24169.12 to 6.0.29-servicing.24171.7 (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**:
- **Date Produced**: March 22, 2024 4:35:16 PM UTC
- **Commit**: e35ea426ec2ee54f57501b661ec7d656caf480d6
- **Branch**: refs/heads/internal/release/6.0.4xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.421-servicing.24171.14 to 6.0.421-servicing.24172.16][1]
  - **Microsoft.NET.Sdk**: [from 6.0.421-servicing.24171.14 to 6.0.421-servicing.24172.16][1]
  - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.29 to 6.0.29][2]
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.29-servicing.24169.26 to 6.0.29-servicing.24171.9][2]
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: [from 6.0.29-servicing.24169.26 to 6.0.29-servicing.24171.9][2]
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.29 to 6.0.29][2]
  - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.29-servicing.24169.15 to 6.0.29-servicing.24171.6][3]
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.29 to 6.0.29][2]
  - **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 6.0.29-servicing.24169.12 to 6.0.29-servicing.24171.7][4]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC6f9b73911c7a5bd447666c341acc4fffe64635b5&targetVersion=GCe35ea4...
 2024-03-22 17:14:54 +00:00
DotNet Bot
3d530de7d4 Merged PR 38454: [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.421 to 6.0.421 (parent: Microsoft.NET.Sdk)
  - **Microsoft.TemplateEngine.Cli**: from 6.0.421-rtm.24169.9 to 6.0.421-rtm.24171.7 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.421 to 6.0.421 (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**:
- **Date Produced**: March 22, 2024 1:23:09 AM UTC
- **Commit**: 6f9b73911c7a5bd447666c341acc4fffe64635b5
- **Branch**: refs/heads/internal/release/6.0.4xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.421-servicing.24171.7 to 6.0.421-servicing.24171.14][1]
  - **Microsoft.NET.Sdk**: [from 6.0.421-servicing.24171.7 to 6.0.421-servicing.24171.14][1]
  - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.421 to 6.0.421][2]
  - **Microsoft.TemplateEngine.Cli**: [from 6.0.421-rtm.24169.9 to 6.0.421-rtm.24171.7][2]
  - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: [from 6.0.421 to 6.0.421][2]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC60e470eb7aa4134da472ce7a9d89a59bc2d845e4&targetVersion=GC6f9b73911c7a5bd447666c341acc4fffe64635b5&_a=files
[2]: https://dev.azure.com/dnceng/internal/_git/dotnet-templating/branches?baseVersion=GC86fb50d661cb520041b127141b6bb8a53769ee6f&targetVersion=GC9ebb8d1d13e5672c54d1682cdc82eb5f474b9586&_a=files

[DependencyUpdate]: <> (End)

[marker]: <> (End:a27c2ce2-aedf-42b7-d31e-08da6571bd31)
 2024-03-22 16:08:37 +00:00
dotnet-maestro[bot]
c752048aa2 Update dependencies from https://github.com/dotnet/arcade build 
Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk
 From Version 7.0.0-beta.24114.4 -> To Version 7.0.0-beta.24171.6
 2024-03-22 03:42:09 +00:00
DotNet Bot
5102888162 Merged PR 38441: [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.NETCore.App.Ref**: from 6.0.29 to 6.0.29 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.29-servicing.24169.13 to 6.0.29-servicing.24171.5 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.29 to 6.0.29 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.29 to 6.0.29 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.29 to 6.0.29 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.Platforms**: from 6.0.13 to 6.0.13 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref**: from 6.0.29 to 6.0.29 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.29-servicing.24169.21 to 6.0.29-servicing.24171.8 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.29 to 6.0.29 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.29-servicing.24169.21 to 6.0.29-servicing.24171.8 (parent: Microsoft.NET.Sdk)
  - **dotnet-dev-certs**: from 6.0.29-servicing.24169.21 to 6.0.29-servicing.24171.8 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-secrets**: from 6.0.29-servicing.24169.21 to 6.0.29-servicing.24171.8 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.29-servicing.24169.13 to 6.0.29-servicing.24171.5 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NET.Workload.Emscripten.Manifest-6.0.400**: from 6.0.28 to 6.0.29 (parent: VS.Redist.Common.NetCore.SharedFramework.x64.6.0)

[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**:
- **Date Produced**: March 21, 2024 10:02:30 PM UTC
- **Commit**: 60e470eb7aa4134da472ce7a9d89a59bc2d845e4
- **Branch**: refs/heads/internal/release/6.0.4xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.421-servicing.24170.1 to 6.0.421-servicing.24171.7][1]
  - **Microsoft.NET.Sdk**: [from 6.0.421-servicing.24170.1 to 6.0.421-servicing.24171.7][1]
  - **Microsoft.NETCore.App.Ref**: [from 6.0.29 to 6.0.29][2]
  - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: [from 6.0.29-servicing.24169.13 to 6.0.29-servicing.24171.5][2]
  - **Microsoft.NETCor...
 2024-03-22 00:59:50 +00:00
dotnet-maestro[bot]
32becbf8c1 Update dependencies from https://github.com/dotnet/arcade build 
Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk
 From Version 7.0.0-beta.24114.4 -> To Version 7.0.0-beta.24171.2
 2024-03-21 22:37:28 +00:00
Ella Hathaway
e8c186ecd4
Update MsftToSbSdk.diff baseline (#19118) 2024-03-21 09:06:17 -07:00
dotnet-bot
ef7589b476 Merge in 'release/7.0.1xx' changes 2024-03-20 23:21:29 +00:00