Commit graph

1177 commits

Author SHA1 Message Date
Marc Paine
b3e1a28fb3
Merge pull request #14297 from dotnet-maestro-bot/merge/release/6.0.4xx-to-main
[automated] Merge branch 'release/6.0.4xx' => 'main'
2022-08-10 10:18:46 -07:00
Marc Paine
dd19808458
Merge pull request #14267 from dotnet/marcpopMSFT-fixknownapphostmain
Stop downloading app hosts for android
2022-08-10 10:18:11 -07:00
Marc Paine
eeb9ec1382
Merge branch 'main' into merge/release/6.0.4xx-to-main 2022-08-09 14:04:34 -07:00
Marc Paine
eaaf3b3160
Merge pull request #14276 from dotnet/marcpopMSFT-addbuildtoversion
Add the full nuget version into the .version file
2022-08-09 14:02:46 -07:00
Doug Bunting
4834b574a7
[main] Update template versions from dotnet/aspnetcore (#14246) 2022-08-09 19:48:35 +00:00
Marc Paine
e2a0da3d8f Add the full nuget version into the .version file 2022-08-08 14:21:30 -07:00
Marc Paine
9c8ffb2f43
Stop downloading app hosts for android 2022-08-05 12:05:26 -07:00
Marc Paine
005dd2364d
Stop app host downloads for android 2022-08-05 12:04:17 -07:00
Marc Paine
9d5facb590
Merge branch 'release/6.0.4xx' into merge/release/6.0.3xx-to-release/6.0.4xx 2022-08-02 17:11:45 -07:00
Marc Paine
91727aeb14
Merge branch 'release/6.0.3xx' into merge/release/6.0.1xx-to-release/6.0.3xx 2022-08-02 12:55:16 -07:00
Marc Paine
cf729ea84f Fix the 6.0 WD template bundles to use the 6.0 templates. 2022-07-28 13:34:38 -07:00
Jason Zhai
9fd920937e Merge branch 'release/6.0.4xx' into main 2022-07-21 19:19:37 -07:00
Marc Paine
55859829cd
Actually update implicit version to 3.1.28 (#14187) 2022-07-21 10:56:34 -07:00
Matt Mitchell
a9d6b28f1e
Re-support in-build signing (#14165)
Add back in support for in-build signing. This is actually even simpler than it was before, because arcade added support for signing wixpacks. So there is no need to do the iterative sign->pack->sign->pack process that was previously common in any repo that creates an installer. Instead, the normal sign target in the arcade SDK build process will simply process all of the files to sign.
Post-build signing remains the default, but will be flipped once verification is complete
2022-07-20 10:41:49 -07:00
Marc Paine
6e22d938ef
Update to target 3.1.28 2022-07-14 11:13:38 -07:00
Marc Paine
da4c6c0b23 Fix logic for putting the manifests in the right location. 2022-07-13 17:15:27 -07:00
Marc Paine
6b9fa18ad7
Install the manifests into their specific feature band rather than the current band 2022-07-13 13:43:25 -07:00
Marc Paine
b81dfada12
Update BundledTemplates.targets 2022-07-12 15:58:08 -07:00
William Godbe
9af47dc205
Update Asp.Net template (#14113)
* Update Asp.Net template

* Update GenerateBundledVersions.targets

* Update Versions.props
2022-07-12 19:34:25 +00:00
Marc Paine
51754b4c58
Fix pathing issue in the releases layout in the nuget file 2022-07-08 12:10:15 -07:00
Marc Paine
e5f74139a6 Add the releases dll to the msbuild sdk resolvers folder. 2022-07-07 16:40:41 -07:00
Marc Paine
8c5b725f5f
Update GenerateBundledVersions.targets 2022-06-29 13:00:55 -07:00
dotnet-maestro[bot]
a9bd605e2e
[main] Update dependencies from dotnet/arcade (#14036)
* Update dependencies from https://github.com/dotnet/arcade build 20220623.2

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk
 From Version 7.0.0-beta.22322.3 -> To Version 7.0.0-beta.22323.2

* Reference net7.0 version of BuildTasksInstallers assembly

* Remove backported arcade patch

* Remove patch that was for bootstrapping source-build

* Update dependencies from https://github.com/dotnet/arcade build 20220624.1

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk
 From Version 7.0.0-beta.22322.3 -> To Version 7.0.0-beta.22324.1

* Update dependencies from https://github.com/dotnet/arcade build 20220627.1

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk
 From Version 7.0.0-beta.22322.3 -> To Version 7.0.0-beta.22327.1

Dependency coherency updates

Microsoft.SourceLink.GitHub,Microsoft.DotNet.XliffTasks
 From Version 1.2.0-beta-22271-02 -> To Version 1.2.0-beta-22325-02 (parent: Microsoft.DotNet.Arcade.Sdk

* Revert "Remove patch that was for bootstrapping source-build"

This reverts commit eb2dc3d7c1e6f23e191e7c49279c3b25ebf023ff.

* Update fsharp System.Memory package version to 4.5.5

* Don't directly reference SCI and SCM 5.0.0 from SDK

* Add backport links to new source-build patches

* Update dependencies from https://github.com/dotnet/arcade build 20220627.2

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk
 From Version 7.0.0-beta.22322.3 -> To Version 7.0.0-beta.22327.2

Dependency coherency updates

Microsoft.SourceLink.GitHub,Microsoft.DotNet.XliffTasks
 From Version 1.2.0-beta-22271-02 -> To Version 1.2.0-beta-22325-02 (parent: Microsoft.DotNet.Arcade.Sdk

* Update source-build xml doc baseline

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Logan Bussell <loganbussell@microsoft.com>
Co-authored-by: MichaelSimons <msimons@microsoft.com>
2022-06-28 18:08:30 +00:00
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
Daniel Plaisted
34ba3a68bb
Merge pull request #13974 from manodasanW/master
[main] Add support for targeting Windows version 22621 and update Windows SDK projections
2022-06-14 16:22:37 -07:00
William Godbe
2dc51c984e
Update Asp.Net templates (#13966)
* Update Asp.Net templates

* Update GenerateBundledVersions.targets
2022-06-14 12:09:01 -07:00
Manodasan Wignarajah
87fc91672a Add support for targeting Windows version 22621 and update Windows SDK projections. 2022-06-14 01:23:16 -07:00
Manodasan Wignarajah
9270a6638c Add support for targeting Windows version 22621 and update Windows SDK projections. 2022-06-14 01:10:25 -07:00
Jason Zhai
732667a98a Merge branch 'release/6.0.4xx' into main 2022-06-09 02:49:42 -07:00
Jakub Jareš
47c53d5fa0
Merge pull request #13939 from nohwnd/fix-dump-minitool 2022-06-09 10:12:01 +02:00
Jakub Jareš
0c7c5381b9 Fix cross-gen for DumpMinitool 2022-06-09 08:06:36 +02: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
Marc Paine
92f9b7b00d
Merge pull request #13908 from dotnet/marcpopMSFT-fixdebbuild
Remove the external docker files and fix the debbuild
2022-06-08 13:05:34 -07:00
Jo Shields
15e1a9aee6
Merge pull request #13909 from directhex/bionic-means-bionic
Add linux-bionic-* known runtime packs
2022-06-08 13:10:20 -04:00
Jo Shields
7bb09b3f1c
Update src/redist/targets/GenerateBundledVersions.targets
Co-authored-by: Mitchell Hwang <16830051+mdh1418@users.noreply.github.com>
2022-06-08 10:30:15 -04:00
Jakub Jareš
a1fbbff57a Fix cross-gen for dumpMinitool 2022-06-08 12:42:54 +02:00
Safia Abdalla
116a6a8bc5
Integrate new user-jwts tool into installer (#13895) (#13913) 2022-06-07 15:20:07 -07:00
Jo Shields
fe8ff26c2f Suggestions from Mitch 2022-06-07 10:42:47 -04:00
Jo Shields
1aff5868fe Address suggestions from Alex 2022-06-07 10:40:28 -04:00
Jo Shields
ea927d477b Add linux-bionic-* known runtime packs.
Without this, `dotnet publish -r linux-bionic-x64` uses vanilla linux-x64
2022-06-03 13:52:08 -04:00
Marc Paine
8b16a6268f
Only run the deb build on specific legs 2022-06-03 09:12:24 -07:00
Marc Paine
86f3ab2e74
Merge pull request #13883 from dotnet/marcpopMSFT-removepostinstall
Remove the welcome text from the postinstall scripts in favor of the first run experience
2022-06-02 10:48:55 -07:00
Grace Kulin
cb6f7680d6
Merge pull request #13873 from dotnet-maestro-bot/merge/release/6.0.4xx-to-main
[automated] Merge branch 'release/6.0.4xx' => 'main'
2022-05-31 08:45:24 -07:00
Marc Paine
949b047558
Merge pull request #13880 from dotnet-maestro-bot/merge/release/6.0.3xx-to-release/6.0.4xx
[automated] Merge branch 'release/6.0.3xx' => 'release/6.0.4xx'
2022-05-27 16:30:26 -07:00
Marc Paine
523d64bcbf
Update after_install_host.sh 2022-05-27 16:25:24 -07:00
Marc Paine
f7a690e650
Update postinst 2022-05-27 16:24:26 -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