Commit graph

650 commits

Author SHA1 Message Date
Davis Goodin
c9e2ed40b9 Add target rid to NetCoreAppHostRids 2021-05-04 10:49:37 -07:00
Nathan Mytelka
50a33e74cf Ignore assembly conflict warnings 2021-04-28 17:25:39 -07:00
Marc Paine
134dcdac41
Remove the duplicate implicit version properties 2021-04-28 11:54:16 -07:00
Nathan Mytelka
93b2806b0a Merge branch 'main' of https://github.com/dotnet/installer into create-precomputed-rar-cache 2021-04-28 10:45:26 -07:00
Nathan Mytelka
078be5a2d1 Change searchpath 2021-04-27 22:38:21 -07:00
Sarah Oslund
f74a415e62 Update manifest installer authoring to allow for data dir 2021-04-26 15:24:30 -07:00
Nathan Mytelka
b956cb7a9f Switch to calling RAR directly 2021-04-26 12:27:53 -07:00
Nathan Mytelka
0a135650c2 Switch to using stage 0 sdk 2021-04-26 11:31:16 -07:00
Nathan Mytelka
34dc6f4744 platform-specific executable 2021-04-19 16:15:30 -07:00
Marc Paine
a51cc90bad
Update GenerateBundledVersions.targets 2021-04-19 10:18:33 -07:00
Jason Zhai
c3f42ecccd Merge branch 'release/5.0.3xx' into main 2021-04-19 01:24:07 -07:00
Anton Lapounov
2455d34ceb
Extend the list of RIDs supported by Crossgen2 (#10250) 2021-04-18 19:19:05 -07:00
Bo Anderson
e4b1e681b5
Add macOS RIDs for crossgen2 (#10159) 2021-04-18 17:37:03 -07:00
Steve MacLean
c1eb61ac81
Apple Silicon Distribution-Template (#10223)
Add hostArchitectures attribute to stop installer from requiring Rosetta

Update the minimum required version to 11.0 for Apple Silicon
2021-04-15 16:42:30 -04:00
Sarah Oslund
c02505d316 Bump implicit versions to 3.1.14 and 2.1.27 2021-04-15 13:03:50 -07:00
Alexander Köplinger
4f02edc80b
Remove IsTrimmable from Mono KnownRuntimePack (#10231)
The assemblies themselves embed the trimmable information now, see 6c2b85564f
2021-04-15 20:39:03 +02:00
Alexander Köplinger
be57cb9130
Improve GenerateBundledVersions.targets to include only existing RIDs in KnownFrameworkReference (#10222)
Move the Mono-only rids to the KnownRuntimePack.
2021-04-15 10:22:30 +02:00
Igor Velikorossov
a069111a95
Update GenerateBundledVersions.targets (#10195) 2021-04-14 11:12:08 +10:00
Anirudh Agnihotry
174902835a
update the netcoreapp versions (#10208) 2021-04-13 16:23:11 -07:00
Marc Paine
fb77ff34fb
Merge pull request #10206 from akoeplinger/mono-runtimepacknames
Add KnownRuntimePack entries for Mono-based runtime packs
2021-04-13 13:16:48 -07:00
Alexander Köplinger
b75e498821 Add KnownRuntimePack entries for Mono-based runtime packs
We need this now that we changed the name of the Mono-based runtime packs.

See https://github.com/dotnet/sdk/pull/11824 for the design.

Fixes https://github.com/dotnet/sdk/issues/11227
2021-04-13 20:07:13 +02:00
Nathan Mytelka
4394dfd720 restore 2021-04-12 15:10:08 -07:00
Nathan Mytelka
e56d575703 Change path names
Other layout path was correct on debug but apparently wrong on Release.
2021-04-12 12:34:36 -07:00
Nathan Mytelka
dbcdf68b27 Merge https://github.com/dotnet/installer into create-precomputed-rar-cache 2021-04-08 14:53:40 -07:00
John Luo
5542708837 Update aspnetcore 2.1 & 3.1 & 5.0 template versions 2021-04-06 10:57:50 -07:00
Nathan Mytelka
216706e5b9 Update path and project 2021-04-05 14:45:06 -07:00
Jason Zhai
c01306370f Merge branch 'release/5.0.3xx' into main 2021-04-01 19:19:12 -07:00
Nathan Mytelka
509612827e Include all files and folders 2021-04-01 14:16:43 -07:00
Andy Gocke
196750992a
Switch to using non-internal packages (#10107)
After https://github.com/dotnet/runtime/pull/50434 we can depend on the non-internal
packages, which also contains the host.
2021-04-01 13:02:46 -07:00
Sarah Oslund
99b8a3a159 Update _AspNet31RuntimePackVersion to 3.1.13 2021-03-30 14:13:51 -07:00
Sarah Oslund
5cc7b5c054 Update implicit versions to 2.1.26 and 3.1.13 2021-03-30 14:03:16 -07:00
Marc Paine
e425b1dca0 We were incorrectly includes .net core files and targets in the VS swr file. 2021-03-30 10:24:17 -07:00
Sarah Oslund
1853dede26
Merge pull request #10036 from sfoslund/SdkManifestPkgs
Adding sdk manifests to pkg generation
2021-03-29 08:39:52 -07:00
dotnet-maestro[bot]
7876ef965a
[main] Update dependencies from dotnet/sdk (#10023)
[main] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.WindowsDesktop.App.Ref: from 6.0.0-preview.3.21172.2 to 6.0.0-preview.4.21175.1 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0: from 6.0.0-preview.3.21172.2 to 6.0.0-preview.4.21175.1 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.0-preview.3.21167.1 to 6.0.0-preview.4.21176.1 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Ref: from 6.0.0-preview.3.21167.1 to 6.0.0-preview.4.21176.1 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Runtime.win-x64: from 6.0.0-preview.3.21167.1 to 6.0.0-preview.4.21176.1 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Host.win-x64: from 6.0.0-preview.3.21167.1 to 6.0.0-preview.4.21176.1 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.DotNetHostResolver: from 6.0.0-preview.3.21167.1 to 6.0.0-preview.4.21176.1 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.Platforms: from 6.0.0-preview.3.21167.1 to 6.0.0-preview.4.21176.1 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Ref: from 6.0.0-preview.3.21172.8 to 6.0.0-preview.4.21176.2 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Ref.Internal: from 6.0.0-preview.3.21172.8 to 6.0.0-preview.4.21176.2 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.0-preview.3.21172.8 to 6.0.0-preview.4.21176.2 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0: from 6.0.0-preview.3.21172.8 to 6.0.0-preview.4.21176.2 (parent: Microsoft.NET.Sdk)
  - dotnet-dev-certs: from 6.0.0-preview.3.21172.8 to 6.0.0-preview.4.21176.2 (parent: Microsoft.NET.Sdk)
  - dotnet-user-secrets: from 6.0.0-preview.3.21172.8 to 6.0.0-preview.4.21176.2 (parent: Microsoft.NET.Sdk)
  - Microsoft.DotNet.Common.ItemTemplates: from 6.0.100-preview.3.21161.1 to 6.0.100-preview.4.21176.3 (parent: Microsoft.NET.Sdk)
  - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.0-preview.3.21172.2 to 6.0.0-preview.4.21175.1 (parent: Microsoft.NET.Sdk)
  - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.0-preview.3.21172.2 to 6.0.0-preview.4.21175.1 (parent: Microsoft.NET.Sdk)
  - Microsoft.DotNet.Wpf.ProjectTemplates: from 6.0.0-preview.3.21171.2 to 6.0.0-preview.4.21174.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - Microsoft.NET.ILLink.Tasks: from 6.0.100-preview.2.21172.2 to 6.0.100-preview.2.21174.1 (parent: Microsoft.NET.Sdk)
  - Microsoft.Net.Compilers.Toolset: from 3.10.0-2.21173.26 to 3.10.0-2.21175.26 (parent: Microsoft.NET.Sdk)
  - Microsoft.Build: from 16.10.0-preview-21173-01 to 16.10.0-preview-21175-01 (parent: Microsoft.NET.Sdk)

 - Remove Android, iOS, and macCatalyst from CA1416 analyzer warnings

 - Merge remote-tracking branch 'origin/main' into darc-main-3ea62347-a0cb-4e6d-8270-37add6b236fa

 - Missed property use
2021-03-26 23:45:47 +00:00
Nathan Mytelka
6eabc3b7d4 Introduce pre-caching into installer 2021-03-26 13:23:38 -07:00
sfoslund
9a0c551cff Adding sdk manifests to pkg generation 2021-03-26 12:49:34 -07:00
Marc Paine
73f77caa19
Merge pull request #10000 from dotnet/marcpopMSFT-updateMain
Updated installer files from master to main.
2021-03-26 10:53:29 -07:00
Jo Shields
a112bf8501
Rename iOS simulator targets from 'ios' to 'iossimulator' RID (#10029) 2021-03-26 12:43:00 +01:00
Andy Gocke
82a95978c4
Avoid duplicate txt files in official build (#10026) 2021-03-24 22:49:28 -07:00
Andy Gocke
a98263b0da
Add support for building a PGO installer copy (#9877)
Uses the uninstrumented profiling PGO bits from the runtime when the
'-pgoinstrument' flag is set.
2021-03-24 01:02:14 -07:00
Marc Paine
4ffebc1dac Updated installer files from master to main. Added a nuget.config so that the table generator will build. 2021-03-23 16:50:22 -07:00
Sarah Oslund
b69eb79398 Error on invalid workload content 2021-03-22 14:55:56 -07:00
Sarah Oslund
efe1496340 Fix workload manifest generation to handle case sensitive file systems 2021-03-22 13:31:24 -07:00
Sarah Oslund
afbd4fa212
Merge pull request #9935 from sfoslund/XamarinManifest
Adding workload manifests to installers
2021-03-18 15:05:04 -07:00
Sarah Oslund
1047ed5928 PR feedback 2021-03-18 09:16:13 -07:00
Anirudh Agnihotry
902afa1c51
add 3.0 & 5.0 template (#9914) 2021-03-14 10:11:09 -07:00
Sarah Oslund
02696474a1 Adding xamarin workload manifests 2021-03-12 10:00:04 -08:00
Sarah Oslund
dfe947054b Adding workload manifests to installers 2021-03-11 14:03:04 -08:00
William Godbe
f7745cd74c
Update aspnetcore 2.1/3.1/5.0 template versions (#9821)
* Update aspnetcore 2.1/3.1/5.0 template versions

* Update GenerateBundledVersions.targets
2021-03-09 13:05:14 -08:00
dotnet-maestro[bot]
6c2b85564f
[master] Update dependencies from dotnet/sdk (#9846)
[master] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.NET.ILLink.Tasks: from 6.0.100-preview.2.21124.3 to 6.0.100-preview.2.21125.1 (parent: Microsoft.NET.Sdk)

 - Don't set IsTrimmable on netcoreapp in 6.0

These assemblies now opt into trimming using AssemblyMetadata:
https://github.com/dotnet/runtime/pull/48428.

The SDK side of the change was made in https://github.com/dotnet/sdk/pull/16094.

For more context, see
https://github.com/mono/linker/blob/main/docs/design/trimmed-assemblies.md#net-6.
2021-03-02 00:54:23 +00:00
Matt Mitchell
95ef7ddfd3 Use VS redist targeting pack version for blob location 2021-02-23 17:12:42 -08:00
Matt Mitchell
23f416f8de Cherry-pick internal runtime download change 2021-02-23 16:43:00 -08:00
Jason Zhai
273a80d66e Merge branch 'release/5.0.2xx' 2021-02-17 22:18:27 -08:00
William Li
ad7e175e66 aspnet targeting pack does not move every release 2021-02-17 09:12:52 -08:00
Marc Paine
ac4b7d95d9 Automatically calculate the implicit version number based on the current version. This will need to be updated any time 2.1 or 3.1 don't ship. 2021-02-16 14:22:17 -08:00
Michelle McDaniel
ed4165ce90
Duplicate productVersion.txt with repo-specific name (#9666) (#9708)
In our efforts to unify the build access story using aka.ms links, we have found that there are certain files that share the same name in multiple different repositories, most importantly, productVersion.txt. As part of the work to move to aka.ms links, we will be flattening the short link paths, so rather than having a runtime-specific, aspnetcore-specific, etc. full path to the files generated by each of the repos, they will all go to the same short link location. This means that the path to productVersion.txt will collide in the aka.ms links (the backing locations are not changing and will be unaffected). To combat this, we will add a duplicate of each of the product repos productVersion.txt, renamed to indicate which product repo it came from, in this case installer-productVersion.txt. The original will remane so that we do not break existing scenarios that do not use the aka.ms links.
2021-02-16 09:22:56 -08:00
Michelle McDaniel
533a174fe0
Duplicate productVersion.txt with repo-specific name (#9666) (#9709)
In our efforts to unify the build access story using aka.ms links, we have found that there are certain files that share the same name in multiple different repositories, most importantly, productVersion.txt. As part of the work to move to aka.ms links, we will be flattening the short link paths, so rather than having a runtime-specific, aspnetcore-specific, etc. full path to the files generated by each of the repos, they will all go to the same short link location. This means that the path to productVersion.txt will collide in the aka.ms links (the backing locations are not changing and will be unaffected). To combat this, we will add a duplicate of each of the product repos productVersion.txt, renamed to indicate which product repo it came from, in this case installer-productVersion.txt. The original will remane so that we do not break existing scenarios that do not use the aka.ms links.
2021-02-16 09:22:48 -08:00
Daniel Plaisted
e2f8d3b75c
Merge branch 'master' into merge/release/5.0.2xx-to-master 2021-02-11 16:32:49 -08:00
dotnet-maestro[bot]
5e82b73946
[master] Update dependencies from dotnet/arcade (#9663)
[master] Update dependencies from dotnet/arcade


 - Update path to Arcade tasks
2021-02-10 23:17:22 +00:00
Marc Paine
4abcb5d724
Merge pull request #9631 from jkoritzinsky/remove-dotnet-deb-tool-dep
Remove usage of dotnet-deb-tool
2021-02-10 14:44:38 -08:00
Marc Paine
a5eebdbb46
Merge pull request #9635 from brianrob/fix-crossgen
Update List of Assemblies to Crossgen
2021-02-10 14:44:04 -08:00
William Godbe
9c886537d9
Update 2.1/3.1/5.0 Aspnetcore template versions (#9680) 2021-02-10 09:06:43 -08:00
Igor Velikorossov
486a0abedb Update WindowsDesktop versions 2021-02-10 16:15:00 +11:00
Jason Zhai
3ba06f90de Merge branch 'release/5.0.2xx' 2021-02-09 19:03:15 -08:00
Michelle McDaniel
1baecf1295
Duplicate productVersion.txt with repo-specific name (#9666)
In our efforts to unify the build access story using aka.ms links, we have found that there are certain files that share the same name in multiple different repositories, most importantly, productVersion.txt. As part of the work to move to aka.ms links, we will be flattening the short link paths, so rather than having a runtime-specific, aspnetcore-specific, etc. full path to the files generated by each of the repos, they will all go to the same short link location. This means that the path to productVersion.txt will collide in the aka.ms links (the backing locations are not changing and will be unaffected). To combat this, we will add a duplicate of each of the product repos productVersion.txt, renamed to indicate which product repo it came from, in this case installer-productVersion.txt. The original will remane so that we do not break existing scenarios that do not use the aka.ms links.
2021-02-09 17:13:36 -08:00
Rolf Bjarne Kvinge
2e6685aae1
Add Mac Catalyst to the list of runtime pack IDs. (#9664) 2021-02-09 22:26:47 +01:00
Anirudh Agnihotry
19311cdf4a
update the 2.1/3/1/5.0 (#9675) 2021-02-09 13:08:43 -08:00
Cristiano Suzuki
118978636e Loc update 2021-02-08 17:54:42 -08:00
Brian Robbins
991ebff59c Remove analyzers from crossgen list. 2021-02-08 15:30:17 -08:00
Jeremy Koritzinsky
8a3c9ad911
Fix DebPackageToolPath. 2021-02-04 15:40:16 -08:00
Jeremy Koritzinsky
056c3db077
Use the package_tool.sh script that dotnet-deb-tool wraps directly and is maintained in Arcade instead of the old dotnet-deb-tool CLI tool package. 2021-02-04 14:46:38 -08:00
Brian Robbins
bf5d05cc4f Update list of assemblies to be crossgen'd. 2021-02-04 14:10:54 -08:00
Marc Paine
50bf980aa2
Merge pull request #9514 from dotnet/installer-text
Installer text improvements
2021-01-27 14:42:54 -08:00
William Li
b056ae09eb Merge branch 'release/5.0.2xx' into master 2021-01-25 21:40:24 -08:00
Pranav K
0215b1c135
Sign dotnet-watch files (#9539)
* Also react to changes to F# compiler
2021-01-25 15:12:48 -08:00
Marc Paine
91202bf011
Merge pull request #9525 from dotnet/marcpopMSFT-installerUI
Add an additional link to our documentation on the installer page
2021-01-24 15:36:44 -08:00
Juan Sebastian Hoyos Ayala
7fbfea47cc Mark ARM64 as a valid platform for WPF and WinForms and fix support bug
Co-authored-by: Alexandre Zollinger Chohfi <alzollin@microsoft.com>
Co-authored-by: Marcpems <marcpe@microsoft.com>
Co-authored-by: Ryland <41491307+ryalanms@users.noreply.github.com>
2021-01-22 16:03:50 -08:00
Maira Wenzel
be2efe28fc
Installer text improvements 2021-01-21 15:38:02 -08:00
Marc Paine
c2e891d288 Add an additional link to our telemetry documentation 2021-01-21 13:02:53 -08:00
Marc Paine
596dd049d6 Add an additional link to our telemetry documentation 2021-01-21 13:01:45 -08:00
William Li
9cab6f6032 Merge branch 'release/5.0.2xx' into master 2021-01-21 10:11:11 -08:00
Pranav K
74e30f8d9c
Use dotnet-watch packed by the SDK (#9498) 2021-01-20 15:44:12 -08:00
Marc Paine
4367d06d57
Merge pull request #9477 from dotnet/marcpopMSFT-releasenoteslink
Update release notes link
2021-01-20 14:09:45 -08:00
Daniel Plaisted
34ed90f436
Merge pull request #9437 from dotnet/Update_windowsdesktop_versions
Update WindowsDesktop versions
2021-01-20 07:20:43 -08:00
Jan Vorlicek
7236ea48e0 [release/5.0.2xx] - Fix linux-musl-arm apphost
Port #9475 to release/5.0.2xx

The linux-musl-arm RID in the GenerateBundledVersions.targets was accidentally
added in Net50RuntimePackRids instead of Net50AppHostRids. That caused a wrong
host (linux-arm) to be extracted during dotnet publish.
2021-01-20 05:05:39 -08:00
Marc Paine
2e7e5600fe Update release notes link 2021-01-19 16:29:10 -08:00
Jan Vorlicek
03bb2be7fe Fix linux-musl-arm apphost
The linux-musl-arm RID in the GenerateBundledVersions.targets was accidentally
added in Net50RuntimePackRids instead of Net50AppHostRids. That caused a wrong
host (linux-arm) to be extracted during dotnet publish.
2021-01-19 16:03:05 -08:00
nohwnd
ff2d662408 Use 6.0 test-template, and remove NUnit because we bundle it in test templates 2021-01-18 13:43:17 +01:00
Igor Velikorossov
0d84694fdb fixup! Update WindowsDesktop versions 2021-01-18 14:19:10 +11:00
Igor Velikorossov
c346eb1e1a Update WindowsDesktop versions 2021-01-15 21:02:34 +11:00
Anirudh Agnihotry
4f056c0679
update Runtime Version (#9428) 2021-01-14 14:46:41 -08:00
William Godbe
8157d78e64
Update 2.1/3.1/5.0 Aspnetcore template versions (#9382) 2021-01-12 14:15:53 -08:00
David Karlaš
d69abb1ae5 Fix .NET 6 template missing for console, library...
Fixes https://github.com/dotnet/templating/issues/2740
2021-01-08 14:07:03 +01:00
Marc Paine
41a84a5ee1
Merge branch 'master' into bump-lastest-5.0-runtime 2020-12-17 10:57:15 -08:00
William Li
9c24da7934
Merge pull request #9198 from dotnet/wtgodbe/Templates501
Update AspnetCore template/runtime versions to 5.0.1
2020-12-17 09:34:40 -08:00
Will Godbe
489b5caeee Apply feedback 2020-12-16 14:38:51 -08:00
Jan Vorlicek
fb49c21816 [release/5.0.2xx] Enable linux-musl-arm* builds in CI
* Enable linux-musl-arm* builds in CI

* Revise recent build table

  Reorder platform table more naturally
  - Windows -> Linux -> Linux-musl -> RHEL -> macOS
  - x64 -> arm -> arm64

  Rename linux-musl -> linux-musl-x64
  Add linux-musl-arm* rows

* Generalize linux-musl-* code to include arm*

- Set /p:OSName='linux-musl'

* Fix linux-musl-arm crossgen logic

* Build linux-musl-arm on Ubuntu 18.04

* Add linux-musl-arm to .NET 5.0 RuntimePackRids
2020-12-13 17:28:29 +01:00
Larry Ewing
ab75328ef8 Bump _NET50RuntimePackVersion to 5.0.1 2020-12-10 15:32:33 -06:00
Daniel Plaisted
7d2413d106 Merge release/5.0.2xx into master 2020-12-10 03:03:23 -08:00
William Godbe
dc2d22f04e
Update GenerateBundledVersions.targets 2020-12-08 15:35:20 -08:00