Commit graph

23390 commits

Author SHA1 Message Date
Manodasan Wignarajah
aac14e609b
Add support for targeting Windows version 22621 and update Windows SDK projections. (#13976) 2022-06-14 16:34:46 -07:00
Manodasan Wignarajah
616cfe956e
Add support for targeting Windows version 22621 and update Windows SDK projections. (#13975) 2022-06-14 16:34:39 -07:00
dotnet-bot
88bffe07a9 Merge in 'release/6.0.3xx' changes 2022-06-14 19:26:16 +00:00
William Godbe
c6cc5179c7
Update Asp.Net template (#13964) 2022-06-14 12:09:13 -07:00
William Godbe
9a4017803e
Update asp.net template (#13965) 2022-06-14 12:09:07 -07:00
Sean Reeser
dc1bc88432 Merge commit '43f9b184817e4f48ba091d068a4d517c86daafd3' into internal-merge-6.0.3xx-2022-06-14-1031 2022-06-14 10:31:06 -07:00
Sean Reeser
caa27c6ae0 Merge commit 'e83a22f55807cbb06f22f80426ed4997c9e82822' into internal-merge-6.0.1xx-2022-06-14-1030 2022-06-14 10:30:57 -07:00
dotnet-bot
0b772a389e Merge in 'release/6.0.3xx' changes 2022-06-13 22:36:59 +00:00
Logan Bussell
85086602ad
[release/6.0.3xx] Add razor-compiler to Source Build (#13652) 2022-06-13 22:26:28 +00:00
dotnet-bot
bfd4dc864a Merge in 'release/6.0.3xx' changes 2022-06-11 04:31:24 +00:00
Marc Paine
06251264f0
Merge pull request #13950 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-06-10 21:19:57 -07:00
dotnet-bot
fb2794324a Merge in 'release/6.0.3xx' changes 2022-06-10 20:33:07 +00:00
Marc Paine
d62c7a24e4
Update format of multiple /p parameters 2022-06-10 13:23:02 -07:00
Marc Paine
28948923ce
Update format of multiple /p parameters 2022-06-10 13:22:26 -07:00
dotnet-bot
5e7bf21a15 Merge in 'release/6.0.3xx' changes 2022-06-10 06:35:36 +00:00
v-wuzhai
09abb090ac
Merge pull request #13947 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-06-09 23:24:36 -07:00
Jason Zhai
7a7252f19c Merge branch 'release/6.0.1xx' into release/6.0.3xx 2022-06-09 22:38:19 -07:00
v-wuzhai
ab5c14e9a6
Merge pull request #13945 from dotnet/darc-release/6.0.1xx-0eefc296-43fb-47af-9e31-a8871911972a
[release/6.0.1xx] Update dependencies from dotnet/source-build-reference-packages
2022-06-09 19:49:51 -07:00
dotnet-bot
3daa86c8c3 Merge in 'release/6.0.3xx' changes 2022-06-09 18:11:27 +00:00
Chris Rummel
17c1d67be5
[release/6.0.3xx] Handle NuGet package source mapping in source-build tasks. (#13733) 2022-06-09 12:57:38 -05:00
dotnet-maestro[bot]
9069c44814 Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220609.1
Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 6.0.0-servicing.22302.1 -> To Version 6.0.0-servicing.22309.1
2022-06-09 15:03:25 +00:00
dotnet-bot
5c16deae09 Merge in 'release/6.0.3xx' changes 2022-06-08 20:17:11 +00:00
Marc Paine
138d21e534
Merge pull request #13863 from dotnet/marcpopMSFT-fixdebbuild
Fix the deb build by getting debuild first
2022-06-08 13:05:45 -07:00
Marc Paine
fd0c042c55
Merge pull request #13864 from dotnet/marcpopMSFT-fixdebbuild
Fix the deb build
2022-06-08 13:05:42 -07:00
dotnet-bot
e2914842f2 Merge in 'release/6.0.3xx' changes 2022-06-08 02:10:52 +00:00
v-wuzhai
6eb484a785
Merge pull request #13934 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-06-07 18:59:53 -07:00
Marc Paine
87bee21ceb
Merge branch 'release/6.0.3xx' into merge/release/6.0.1xx-to-release/6.0.3xx 2022-06-07 13:40:05 -07:00
dotnet-bot
8f64372c07 Merge in 'release/6.0.3xx' changes 2022-06-07 18:59:29 +00:00
Marc Paine
2f68ca3164
Merge pull request #13870 from dotnet/mmitche-patch-2
[release/6.0.3xx] Update pre-release label to servicing
2022-06-07 11:53:02 -07:00
Marc Paine
fd1be0cbdf
Merge pull request #13930 from vseanreesermsft/branding-6.0.107-2022-06-07-1000
Update branding to 6.0.107
2022-06-07 11:48:05 -07:00
Marc Paine
0dd3622172
Merge pull request #13931 from vseanreesermsft/branding-6.0.302-2022-06-07-1000
Update branding to 6.0.302
2022-06-07 11:47:41 -07:00
Sean Reeser
9988564da9 Update branding to 6.0.302 2022-06-07 10:00:18 -07:00
Sean Reeser
5fcd191cd0 Update branding to 6.0.107 2022-06-07 10:00:12 -07:00
dotnet-maestro[bot]
b6641f0bff
[release/6.0.1xx] Update dependencies from dotnet/source-build-reference-packages (#13852)
[release/6.0.1xx] Update dependencies from dotnet/source-build-reference-packages
2022-06-06 01:58:08 +00:00
Marc Paine
8b16a6268f
Only run the deb build on specific legs 2022-06-03 09:12:24 -07:00
dotnet-bot
30f3d96888 Merge in 'release/6.0.3xx' changes 2022-05-30 07:12:18 +00:00
v-wuzhai
283e9cfd19
Merge pull request #13868 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-05-29 23:59:55 -07:00
Jason Zhai
672289ca16 Merge branch 'release/6.0.1xx' into release/6.0.3xx 2022-05-29 23:04:05 -07:00
dotnet-bot
43f9b18481 Merge in 'release/6.0.3xx' changes 2022-05-27 18:09:36 +00:00
dotnet-bot
e83a22f558 Merge in 'release/6.0.1xx' changes 2022-05-27 18:09:15 +00:00
Marc Paine
6ff814b706
Merge pull request #13879 from dotnet/marcpopMSFT-fiximpl603
Update GenerateBundledVersions.targets
2022-05-27 10:57:34 -07:00
Marc Paine
0632d08f8d
Merge pull request #13878 from dotnet/marcpopMSFT-fiximplicitversion
Update GenerateBundledVersions.targets
2022-05-27 10:57:18 -07:00
Marc Paine
8845807f72
Update GenerateBundledVersions.targets 2022-05-27 10:22:17 -07:00
Marc Paine
6c07a124b9
Update GenerateBundledVersions.targets 2022-05-27 10:20:07 -07:00
Marc Paine
4ba8c44fad Remove the old docker files 2022-05-25 16:35:08 -07:00
Marc Paine
c2d2d79875 Merge remote-tracking branch 'origin/release/6.0.1xx' into marcpopMSFT-fixdebbuild 2022-05-25 16:31:41 -07:00
Matt Mitchell
345034987c
Update pre-release label to servicing 2022-05-25 07:21:17 -07:00
DotNet Bot
4ab869cbcb Merged PR 23174: [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.FSharp.Compiler**: from 12.0.3-beta.22219.3 to 12.0.4-beta.22274.4 (parent: Microsoft.NET.Sdk)
  - **Microsoft.SourceBuild.Intermediate.fsharp**: from 6.0.4-beta.22219.3 to 6.0.5-beta.22274.4 (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**: 20220524.11
- **Date Produced**: May 24, 2022 11:44:49 PM UTC
- **Commit**: 8daa5f75dfc7592e30e28e71d448621d12442893
- **Branch**: refs/heads/internal/release/6.0.3xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.NET.Sdk**: [from 6.0.301-rtm.22273.19 to 6.0.301-rtm.22274.11][1]
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.301-rtm.22273.19 to 6.0.301-rtm.22274.11][1]
  - **Microsoft.FSharp.Compiler**: [from 12.0.3-beta.22219.3 to 12.0.4-beta.22274.4][2]
  - **Microsoft.SourceBuild.Intermediate.fsharp**: [from 6.0.4-beta.22219.3 to 6.0.5-beta.22274.4][2]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC04bbbea&targetVersion=GC8daa5f7&_a=files
[2]: 8854f5d...211fd76

[DependencyUpdate]: <> (End)

[marker]: <> (End:b5bca336-8d99-407e-c145-08d9d60066b9)
2022-05-25 00:18:22 +00:00
dotnet-bot
8111421fcc Merge in 'release/6.0.3xx' changes 2022-05-24 22:52:32 +00:00
dotnet-bot
1ce28e3d84 Merge in 'release/6.0.1xx' changes 2022-05-24 22:51:43 +00:00