Commit graph

29135 commits

Author SHA1 Message Date
v-wuzhai
9e40c3b34d
[automated] Merge branch 'release/7.0.1xx' => 'release/7.0.3xx' (#18783) 2024-03-07 10:35:10 +08:00
v-wuzhai
ee748b88df
[release/7.0.3xx] Update dependencies from dotnet/arcade (#18829) 2024-03-06 14:53:49 +08:00
Marc Paine
b7bc54bb25
Update branding to 7.0.315 (#18879) 2024-03-05 14:02:32 -08:00
Sean Reeser
f6ef7ba8a7 Update branding to 7.0.315 2024-03-05 10:59:19 -08:00
dotnet-maestro[bot]
f08697a21d Update dependencies from https://github.com/dotnet/arcade build 20240229.5
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.24129.5
2024-03-01 17:14:02 +00:00
dotnet-maestro[bot]
4283e1fa5e Update dependencies from https://github.com/dotnet/arcade build 20240229.3
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.24129.3
2024-03-01 02:44:31 +00:00
Jason Zhai
bd74878cb1 Merge branch 'release/7.0.1xx' into release/7.0.3xx 2024-02-26 22:42:04 -08:00
Ella Hathaway
387338af69
Update 7.0 SDK diff baseline (#18781) 2024-02-26 19:19:42 +00:00
dotnet-maestro[bot]
f33042e267
[release/7.0.3xx] Update dependencies from dotnet/source-build-reference-packages (#18734)
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
2024-02-21 13:56:40 -06:00
dotnet-maestro[bot]
4c11f5ca09
[release/7.0.1xx] Update dependencies from dotnet/source-build-reference-packages (#18736)
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
2024-02-21 13:46:01 -06:00
Noah Gilson
6f84c7d76c
[automated] Merge branch 'release/7.0.1xx' => 'release/7.0.3xx' (#18712) 2024-02-20 14:09:11 -08:00
Jason Zhai
e7000dd946 Merge branch 'release/7.0.1xx' into release/7.0.3xx 2024-02-17 18:51:31 -08:00
Matt Thalman
723427fa6b
Update SDK diff baseline (#18706) 2024-02-17 08:10:10 -06:00
Marc Paine
bedc675600
[automated] Merge branch 'release/7.0.1xx' => 'release/7.0.3xx' (#18625) 2024-02-15 13:23:56 -08:00
Marc Paine
1f9d55ca69
[release/7.0.3xx] Update dependencies from dotnet/arcade (#18675) 2024-02-15 13:21:34 -08:00
Marc Paine
ec2666d766
[release/7.0.1xx] Update dependencies from dotnet/arcade (#18691) 2024-02-15 13:11:38 -08:00
Marc Paine
cd2eaf8a6c
Merging internal commits for release/7.0.3xx (#18648) 2024-02-15 11:29:05 -08:00
dotnet-maestro[bot]
e44eb502e4 Update dependencies from https://github.com/dotnet/arcade build 20240214.4
Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk
 From Version 7.0.0-beta.24059.5 -> To Version 7.0.0-beta.24114.4
2024-02-15 17:29:14 +00:00
Marc Paine
c54f730528
Merging internal commits for release/7.0.1xx (#18647) 2024-02-15 09:22:35 -08:00
dotnet-maestro[bot]
bf88ec8a07 Update dependencies from https://github.com/dotnet/arcade build 20240214.4
Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk
 From Version 7.0.0-beta.24065.4 -> To Version 7.0.0-beta.24114.4
2024-02-15 17:00:13 +00:00
dotnet-maestro[bot]
932aab20dc Update dependencies from https://github.com/dotnet/arcade build 20240214.4
Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk
 From Version 7.0.0-beta.24065.4 -> To Version 7.0.0-beta.24114.4
2024-02-15 15:59:14 +00:00
Marc Paine
9d335b6802
Merge branch 'release/7.0.3xx' into merge/release/7.0.1xx-to-release/7.0.3xx 2024-02-14 16:00:43 -08:00
vseanreesermsft
bcfaeb63cf
Merge branch 'release/7.0.1xx' into internal-merge-7.0.1xx-2024-02-13-1018 2024-02-14 15:24:13 -08:00
dotnet-maestro[bot]
5f3a791781 Update dependencies from https://github.com/dotnet/arcade build 20240214.2
Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk
 From Version 7.0.0-beta.24065.4 -> To Version 7.0.0-beta.24114.2
2024-02-14 22:07:13 +00:00
dotnet-maestro[bot]
cb33239406 Update dependencies from https://github.com/dotnet/arcade build 20240214.2
Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk
 From Version 7.0.0-beta.24065.4 -> To Version 7.0.0-beta.24114.2
2024-02-14 22:05:05 +00:00
NET Source-Build Bot
ca56ddf2bd
.NET Source-Build 7.0.116 February 2024 Updates (#18653) 2024-02-14 01:26:10 +00:00
Sean Reeser
a174ab6d40 Merge commit '7b4633fafd38f8d3bed1bb864156177c6fd98586' into internal-merge-7.0.3xx-2024-02-13-1018 2024-02-13 10:18:09 -08:00
Sean Reeser
ddf5628c18 Merge commit 'c19b61c54981cf39a4d18c48450f3368f31fdee2' into internal-merge-7.0.1xx-2024-02-13-1018 2024-02-13 10:18:00 -08:00
Noah Gilson
d3c2fcfe45
[automated] Merge branch 'release/6.0.4xx' => 'release/7.0.1xx' (#18587) 2024-02-12 09:47:42 -08:00
Jacques Eloff
aa39fb2795
Update WiX to latest release (#18599) 2024-02-12 09:43:33 -08:00
github-actions[bot]
331c3a1909
[release/7.0.3xx] Update WiX to latest release (#18601)
Co-authored-by: Jacques Eloff <joeloff@users.noreply.github.com>
2024-02-12 09:43:10 -08:00
Jason Zhai
da1ecd699f Merge branch 'release/7.0.3xx' into release/7.0.4xx 2024-02-08 17:44:06 -08:00
v-wuzhai
f0110f5f5c
[automated] Merge branch 'release/6.0.1xx' => 'release/6.0.4xx' (#18542) 2024-02-08 17:20:32 -08:00
v-wuzhai
1ee28a650b
[automated] Merge branch 'release/7.0.1xx' => 'release/7.0.3xx' (#18538) 2024-02-08 17:20:22 -08:00
Jason Zhai
6b42d31870 Merge branch 'release/7.0.1xx' into release/7.0.3xx 2024-02-06 23:29:25 -08:00
Jason Zhai
286d227a78 Merge branch 'release/6.0.1xx' into release/6.0.4xx 2024-02-06 22:13:08 -08:00
v-wuzhai
0f86d2e134
Update branding to 6.0.128 (#18527) 2024-02-06 18:45:37 -08:00
vseanreesermsft
a9611179db
Update branding to 6.0.420 (#18528) 2024-02-06 14:23:02 -08:00
vseanreesermsft
40f96df296
Update branding to 7.0.117 (#18529) 2024-02-06 14:22:57 -08:00
vseanreesermsft
a6060b24f3
Update branding to 7.0.314 (#18530) 2024-02-06 14:22:53 -08:00
Sean Reeser
f32ea3eca6 Update branding to 6.0.128 2024-02-06 12:11:27 -08:00
DotNet Bot
7b4633fafd Merged PR 36665: [internal/release/7.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.AspNetCore.App.Ref**: from 7.0.16 to 7.0.16 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref.Internal**: from 7.0.16-servicing.24067.19 to 7.0.16-servicing.24068.15 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 7.0.16 to 7.0.16 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0**: from 7.0.16-servicing.24067.19 to 7.0.16-servicing.24068.15 (parent: Microsoft.NET.Sdk)
  - **dotnet-dev-certs**: from 7.0.16-servicing.24067.19 to 7.0.16-servicing.24068.15 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-jwts**: from 7.0.16-servicing.24067.19 to 7.0.16-servicing.24068.15 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-secrets**: from 7.0.16-servicing.24067.19 to 7.0.16-servicing.24068.15 (parent: Microsoft.NET.Sdk)

[DependencyUpdate]: <> (End)

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

[marker]: <> (Begin:ca5481e4-f667-4dcd-b176-08db3b93de76)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- **Subscription**: ca5481e4-f667-4dcd-b176-08db3b93de76
- **Build**: 20240119.10
- **Date Produced**: January 19, 2024 6:17:10 PM UTC
- **Commit**: e526ba29cdfac238c7dc40905b855b2ddc7d9d77
- **Branch**: refs/heads/internal/release/7.0.3xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.313 to 7.0.313][1]
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.313-servicing.24068.62 to 7.0.313-servicing.24069.10][1]
  - **Microsoft.NET.Sdk**: [from 7.0.313-servicing.24068.62 to 7.0.313-servicing.24069.10][1]
  - **Microsoft.TemplateEngine.Cli**: [from 7.0.313-servicing.24068.62 to 7.0.313-servicing.24069.10][1]
  - **Microsoft.AspNetCore.App.Ref**: [from 7.0.16 to 7.0.16][2]
  - **Microsoft.AspNetCore.App.Ref.Internal**: [from 7.0.16-servicing.24067.19 to 7.0.16-servicing.24068.15][2]
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 7.0.16 to 7.0.16][2]
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0**: [from 7.0.16-servicing.24067.19 to 7.0.16-servicing.24068.15][2]
  - **dotnet-dev-certs**: [from 7.0.16-servicing.24067.19 to 7.0.16-servicing.24068.15][2]
  - **dotnet-user-jwts**: [from 7.0.16-servicing.24067.19 to 7.0.16-servicing.24068.15][2]
  - **dotnet-user-secrets**: [from 7.0.16-servicing.24067.19 to 7.0.16-servicing.24068.15][2]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC1f3b71634ebe0f75164461f73d6305d1aeb44...
2024-01-19 18:41:14 +00:00
DotNet-Bot
dd89f67b32 Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240119.10
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 7.0.313 -> To Version 7.0.313

Dependency coherency updates

Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets
 From Version 7.0.16 -> To Version 7.0.16 (parent: Microsoft.NET.Sdk
2024-01-19 18:36:49 +00:00
DotNet Bot
c19b61c549 Merged PR 36662: [internal/release/7.0.1xx] 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.AspNetCore.App.Ref**: from 7.0.16 to 7.0.16 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref.Internal**: from 7.0.16-servicing.24067.19 to 7.0.16-servicing.24068.15 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 7.0.16 to 7.0.16 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0**: from 7.0.16-servicing.24067.19 to 7.0.16-servicing.24068.15 (parent: Microsoft.NET.Sdk)
  - **dotnet-dev-certs**: from 7.0.16-servicing.24067.19 to 7.0.16-servicing.24068.15 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-jwts**: from 7.0.16-servicing.24067.19 to 7.0.16-servicing.24068.15 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-secrets**: from 7.0.16-servicing.24067.19 to 7.0.16-servicing.24068.15 (parent: Microsoft.NET.Sdk)

[DependencyUpdate]: <> (End)

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

[marker]: <> (Begin:65272799-fe4d-4dbf-f0fe-08da7ef63651)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- **Subscription**: 65272799-fe4d-4dbf-f0fe-08da7ef63651
- **Build**: 20240119.8
- **Date Produced**: January 19, 2024 5:24:00 PM UTC
- **Commit**: a73e6ff24023ae17e8d5882a8f40545b20bf3428
- **Branch**: refs/heads/internal/release/7.0.1xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.116 to 7.0.116][1]
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.116-servicing.24068.56 to 7.0.116-servicing.24069.8][1]
  - **Microsoft.NET.Sdk**: [from 7.0.116-servicing.24068.56 to 7.0.116-servicing.24069.8][1]
  - **Microsoft.TemplateEngine.Cli**: [from 7.0.116-servicing.24068.56 to 7.0.116-servicing.24069.8][1]
  - **Microsoft.AspNetCore.App.Ref**: [from 7.0.16 to 7.0.16][2]
  - **Microsoft.AspNetCore.App.Ref.Internal**: [from 7.0.16-servicing.24067.19 to 7.0.16-servicing.24068.15][2]
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 7.0.16 to 7.0.16][2]
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0**: [from 7.0.16-servicing.24067.19 to 7.0.16-servicing.24068.15][2]
  - **dotnet-dev-certs**: [from 7.0.16-servicing.24067.19 to 7.0.16-servicing.24068.15][2]
  - **dotnet-user-jwts**: [from 7.0.16-servicing.24067.19 to 7.0.16-servicing.24068.15][2]
  - **dotnet-user-secrets**: [from 7.0.16-servicing.24067.19 to 7.0.16-servicing.24068.15][2]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC0277d57f52677a9a9a5575c2fada5a90b39a5ec5&...
2024-01-19 18:02:20 +00:00
DotNet-Bot
e0afed1914 Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240119.8
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 7.0.116 -> To Version 7.0.116

Dependency coherency updates

Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets
 From Version 7.0.16 -> To Version 7.0.16 (parent: Microsoft.NET.Sdk
2024-01-19 17:43:53 +00:00
DotNet Bot
72c9ce8b1f Merged PR 36645: [internal/release/7.0.3xx] Update dependencies from dnceng/internal/dotnet-sdk
This pull request updates the following dependencies

[marker]: <> (Begin:ca5481e4-f667-4dcd-b176-08db3b93de76)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- **Subscription**: ca5481e4-f667-4dcd-b176-08db3b93de76
- **Build**: 20240118.62
- **Date Produced**: January 19, 2024 2:34:34 AM UTC
- **Commit**: 1f3b71634ebe0f75164461f73d6305d1aeb4403d
- **Branch**: refs/heads/internal/release/7.0.3xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.313 to 7.0.313][2]
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.313-servicing.24068.44 to 7.0.313-servicing.24068.62][2]
  - **Microsoft.NET.Sdk**: [from 7.0.313-servicing.24068.44 to 7.0.313-servicing.24068.62][2]
  - **Microsoft.TemplateEngine.Cli**: [from 7.0.313-servicing.24068.44 to 7.0.313-servicing.24068.62][2]

[2]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCc9fbcd1e5682e75d1fb95f5a3360856f56786685&targetVersion=GC1f3b71634ebe0f75164461f73d6305d1aeb4403d&_a=files

[DependencyUpdate]: <> (End)

[marker]: <> (End:ca5481e4-f667-4dcd-b176-08db3b93de76)
2024-01-19 17:41:05 +00:00
DotNet Bot
bc3d2fe1f9 Merged PR 36642: [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**: 20240118.56
- **Date Produced**: January 19, 2024 12:34:10 AM UTC
- **Commit**: 0277d57f52677a9a9a5575c2fada5a90b39a5ec5
- **Branch**: refs/heads/internal/release/7.0.1xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.116 to 7.0.116][1]
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.116-servicing.24068.45 to 7.0.116-servicing.24068.56][1]
  - **Microsoft.NET.Sdk**: [from 7.0.116-servicing.24068.45 to 7.0.116-servicing.24068.56][1]
  - **Microsoft.TemplateEngine.Cli**: [from 7.0.116-servicing.24068.45 to 7.0.116-servicing.24068.56][1]

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

[DependencyUpdate]: <> (End)

[marker]: <> (End:65272799-fe4d-4dbf-f0fe-08da7ef63651)
2024-01-19 17:41:05 +00:00
DotNet-Bot
da8e258b32 Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240118.62
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 7.0.313 -> To Version 7.0.313
2024-01-19 02:55:00 +00:00
Sean Reeser
e97bad6e39 Merged PR 36650: [internal/release/7.0.3xx] Merge from public
Merge from public release/7.0.3xx to internal/release/7.0.3xx and resolve conflicts if necessary
2024-01-19 01:59:06 +00:00
DotNet-Bot
3bd45e7983 Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240118.58
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 7.0.313 -> To Version 7.0.313
2024-01-19 01:37:57 +00:00