Commit graph

4591 commits

Author SHA1 Message Date
dseefeld
33f1944c6a Use PVP for PlatformAbstractions and NuGet.Versioning 2021-05-04 10:49:42 -07:00
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
Rahul Bhandari
b5d5fda0bc
Merge pull request #10210 from dotnet/rbhanda-patch-1
Update snaps for April releases
2021-04-28 11:51:35 -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
Rahul Bhandari
8adcebe113
Update snapcraft.yaml 2021-04-13 12:10:21 -07:00
Rahul Bhandari
58cdf0b124
Update snapcraft.yaml 2021-04-13 12:08:49 -07:00
Rahul Bhandari
9a0995a3e9
Update snapcraft.yaml 2021-04-13 12:07:36 -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
ee59b48e7b
Merge pull request #10015 from sfoslund/linuxManifests
Fix workload manifest generation to handle case sensitive file systems
2021-03-22 15:55:56 -07:00
Sarah Oslund
b69eb79398 Error on invalid workload content 2021-03-22 14:55:56 -07:00
Viktor Hofer
4cf1564639
Move dotnet-sdk snaps from dotnet/runtime (#9975)
* Move dotnet-sdk snaps from dotnet/runtime

Dotnet/runtime was the home of the snap files for both dotnet-runtime
dotnet dotnet-sdk snap files. Moving the dotnet-sdk snap files into
dotnet/installer next to the installers.

* Create CODEOWNERS
2021-03-22 21:51:25 +01: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
9abd0606af Don't match warning/error text from package_tool in DotNetDebTool 2021-02-05 10:25:08 -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
William Godbe
8d0a196da7
Update GenerateBundledVersions.targets 2020-12-08 15:34:37 -08:00
Will Godbe
e5876e7119 Update AspnetCore template/runtime versions to 5.0.1 2020-12-08 10:50:54 -08:00
Daniel Plaisted
3a520ee2cd
Merge pull request #9106 from dsplaisted/create-rid-chain
Add more RuntimeIdentifier information to .NET SDK
2020-11-23 11:35:16 -08:00
eriawan
8f65ba49ad Fix version of .NET to be 6.0 on bundle.wxl 2020-11-23 03:43:44 +07:00
Daniel Plaisted
833bfd10b5
Apply suggestions from code review
Co-authored-by: Adeel Mujahid <3840695+am11@users.noreply.github.com>
2020-11-20 10:06:32 -08:00
Daniel Plaisted
096e69de3a Generate NETCoreSdkRuntimeIdentifierChain.txt in SDK folder 2020-11-20 00:42:41 -08:00
Daniel Plaisted
003b1d1d5c Add NETCoreSdkPortableRuntimeIdentifier to bundled versions 2020-11-20 00:42:14 -08:00
William Li
9d449decf8 Pin NETCoreAppTargetingPackBlobVersion
Since we no longer produce Targeting packs every build after 5.0.0
runtime release.
2020-11-19 10:33:56 -08:00
Steve MacLean
cfa5bc446d
Enable Apple Silicon SDK builds (#8990)
* Enable building osx-arm64
* Use osx-x64 NetStandardTargetingPack for osx-arm64
* Update readme for osx-arm64 SDK
2020-11-18 15:12:39 -05:00
dotnet-maestro[bot]
bb1e128c34
[master] Update dependencies from dotnet/sdk (#9064)
[master] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.AspNetCore.App.Ref: from 6.0.0-alpha.1.20526.6 to 6.0.0-alpha.1.20561.2 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Ref.Internal: from 6.0.0-alpha.1.20526.6 to 6.0.0-alpha.1.20561.2 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0: from 6.0.0-alpha.1.20526.6 to 6.0.0-alpha.1.20561.2 (parent: Microsoft.NET.Sdk)
  - Microsoft.EntityFrameworkCore: from 6.0.0-alpha.1.20509.5 to 6.0.0-alpha.1.20560.6 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.0-alpha.1.20526.6 to 6.0.0-alpha.1.20561.2 (parent: Microsoft.NET.Sdk)
  - dotnet-dev-certs: from 6.0.0-alpha.1.20526.6 to 6.0.0-alpha.1.20561.2 (parent: Microsoft.NET.Sdk)
  - dotnet-user-secrets: from 6.0.0-alpha.1.20526.6 to 6.0.0-alpha.1.20561.2 (parent: Microsoft.NET.Sdk)
  - dotnet-watch: from 6.0.0-alpha.1.20526.6 to 6.0.0-alpha.1.20561.2 (parent: Microsoft.NET.Sdk)

 - Update installer target framework to 6.0

 - Install 5.0.0 and 3.1.0 runtime

 - Merge remote-tracking branch 'upstream/master' into darc-master-4cce5096-36fd-4b94-ba12-5d198a821a27

 - Update SDK to one that targets 6.0

 - disable test as tool build for now

 - Fix aspnet runtime RID
2020-11-17 06:56:05 +00:00
dotnet-maestro[bot]
ebc9a69c8d
[release/5.0.2xx] Update dependencies from dotnet/sdk (#9062)
[release/5.0.2xx] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.WindowsDesktop.App: from 5.0.0-rtm.20529.4 to 5.0.1-servicing.20562.1 (parent: Microsoft.NET.Sdk)
  - Microsoft.DotNet.Common.ItemTemplates: from 5.0.0 to 5.0.0 (parent: Microsoft.NET.Sdk)
  - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 5.0.0 to 5.0.1 (parent: Microsoft.NET.Sdk)
  - Microsoft.Dotnet.WinForms.ProjectTemplates: from 5.0.0-rtm.20529.3 to 5.0.1-servicing.20561.12 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 5.0.0 to 5.0.1 (parent: Microsoft.NET.Sdk)
  - Microsoft.DotNet.Wpf.ProjectTemplates: from 5.0.0-rtm.20529.5 to 5.0.1-servicing.20561.15 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - NuGet.Build.Tasks: from 5.8.0-rc.6930 to 5.9.0-preview.1.6955 (parent: Microsoft.NET.Sdk)

 - Use non-stable location to find targeting pack version

 - Fix windows desktop base url
2020-11-13 01:19:00 +00:00
Matt Mitchell
197c79ff33
Update runtime and targeting pack versions (#9060)
Resolves https://github.com/dotnet/installer/issues/8974
2020-11-11 15:04:49 -08:00
Jeremy Koritzinsky
029081017e
Replace legacy packages with VS insertion packages for non-shipping version numbers. (#9059) 2020-11-11 13:48:35 -08:00
William Godbe
c5573dd579
Update 3.1 template versions from asp.net (#9043) 2020-11-10 14:54:42 -08:00
William Godbe
87f8351fcc
Update 3.1 template versions from asp.net (#9045) 2020-11-10 14:54:33 -08:00
Matt Mitchell
66ad9acda7 Merge remote-tracking branch 'upstream/release/5.0.1xx' into merge-from-5.0 2020-10-30 11:06:39 -07:00
Steve MacLean
01930deb2a
Enable linux-musl-arm* builds in CI (#8984)
* 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-10-29 22:18:46 -04:00
Daniel Plaisted
0585bc66b2
Merge pull request #8973 from dsplaisted/knownframework-6.0
Add KnownFrameworkReference items for .NET 6
2020-10-28 10:55:30 -07:00
Daniel Plaisted
c5bc07d915 Apply code review feedback 2020-10-26 20:18:09 -07:00
Daniel Plaisted
9ec9fce35e Update tests for .NET 6 2020-10-25 19:19:57 -07:00
Daniel Plaisted
66318e6fc4 Switch to net5.0 and net6.0 spellings in BundledVersions 2020-10-25 17:46:32 -07:00
Daniel Plaisted
2c7d23afe9 Add KnownFrameworkReference items for .NET 6
Fixes https://github.com/dotnet/sdk/issues/13950
2020-10-23 13:19:43 -07:00
dotnet-maestro[bot]
f8eb583d40
[master] Update dependencies from dotnet/arcade (#8726)
* Update dependencies from https://github.com/dotnet/arcade build 20200924.4

Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Arcade.Sdk
 From Version 5.0.0-beta.20471.1 -> To Version 5.0.0-beta.20474.4

Dependency coherency updates

Microsoft.WindowsDesktop.App.Ref,Microsoft.WindowsDesktop.App,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0,dotnet-dev-certs,dotnet-user-secrets,dotnet-watch,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks
 From Version 5.0.0-rc.2.20474.5 -> To Version 5.0.0-rc.1.20417.4 (parent: Microsoft.NET.Sdk

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

Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Arcade.Sdk
 From Version 5.0.0-beta.20471.1 -> To Version 5.0.0-beta.20478.3

Dependency coherency updates

Microsoft.WindowsDesktop.App.Ref,Microsoft.WindowsDesktop.App,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0,dotnet-dev-certs,dotnet-user-secrets,dotnet-watch,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks
 From Version 5.0.0-rc.2.20474.5 -> To Version 5.0.0-rc.1.20417.4 (parent: Microsoft.NET.Sdk

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

Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Arcade.Sdk
 From Version 5.0.0-beta.20471.1 -> To Version 5.0.0-beta.20506.7

Dependency coherency updates

Microsoft.WindowsDesktop.App.Ref,Microsoft.WindowsDesktop.App,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0,dotnet-dev-certs,dotnet-user-secrets,dotnet-watch,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,Microsoft.SourceLink.GitHub,XliffTasks
 From Version 5.0.0-rc.2.20474.5 -> To Version 5.0.0-rc.1.20417.4 (parent: Microsoft.NET.Sdk

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

Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Arcade.Sdk
 From Version 5.0.0-beta.20471.1 -> To Version 6.0.0-beta.20509.12

Dependency coherency updates

Microsoft.WindowsDesktop.App.Ref,Microsoft.WindowsDesktop.App,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0,dotnet-dev-certs,dotnet-user-secrets,dotnet-watch,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,Microsoft.SourceLink.GitHub,XliffTasks
 From Version 5.0.0-rc.2.20474.5 -> To Version 5.0.0-rc.1.20417.4 (parent: Microsoft.NET.Sdk

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

Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Arcade.Sdk
 From Version 5.0.0-beta.20471.1 -> To Version 6.0.0-beta.20520.8

Dependency coherency updates

Microsoft.SourceLink.GitHub,XliffTasks
 From Version 1.1.0-beta-20464-02 -> To Version 1.1.0-beta-20519-02 (parent: Microsoft.DotNet.Arcade.Sdk

* Update FileInfoAssertions.cs

* Update FileInfoAssertions.cs

* Use tasks provided by Microsoft.DotNet.Build.Tasks.Installers when provided.

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Viktor Hofer <viktor.hofer@microsoft.com>
Co-authored-by: Jeremy Koritzinsky <jekoritz@microsoft.com>
2020-10-23 09:44:02 +02:00
Juan Hoyos
b45ea003fa
Include WindowsDesktop assets in the arm64 bundled installer (#8965)
* Revert "Create ARM64 verision of bundle theme file to account for lack of WindowsDesktop support"
This reverts commit d590b93a1b.

* Include WindowsDesktop assets in the arm64 bundled installer

* Download ARM64 WindowsDesktop msi
2020-10-22 21:01:47 -07:00
Daniel Plaisted
3c9f9f35dd
Merge pull request #8914 from dsplaisted/templates6.0
Add .NET 6 template packages
2020-10-22 12:25:32 -07:00
Daniel Plaisted
bd7b9127bf For templates that don't have 6.0 versions, put 5.0 versions in 6.0 template folder 2020-10-22 08:49:19 -07:00
Daniel Plaisted
6f30dca955 Fix build failures on platforms without an installer file extension 2020-10-21 08:59:51 -07:00
Daniel Plaisted
20c40af16b Fix template PackageDownloads 2020-10-20 23:43:16 -07:00
Daniel Plaisted
e505707598 Refactor template packaging logic to reduce duplication 2020-10-20 21:32:16 -07:00
Daniel Plaisted
bc317938ab Fix cross-branch version number for templates 2020-10-19 12:26:10 -07:00
Daniel Plaisted
1f156bca3c Include 5.0 templates as well as 6.0 ones in layout 2020-10-16 16:24:23 -07:00
Daniel Plaisted
fb9545ecd3 Fix package download for 6.0 templates 2020-10-16 12:23:28 -07:00
Juan Hoyos
53d412f76f
Add "Add arm64 as a possible WinForms arch (#7457)" back (#8906)
This reverts commit a3fc14fd2e.
2020-10-16 09:39:31 -07:00
Daniel Plaisted
0626b90392 Merge upstream changes 2020-10-15 19:47:02 -07:00
Daniel Plaisted
702adede10 Add templates for .NET 6 2020-10-15 19:30:45 -07:00
Matt Mitchell
e8dddcc611
[release/5.0.1xx] Enable post build signing (#8764)
* Enable post build signing
Enables post build signing of installer by including the items that need to be signed
post build in an ItemsToSignPostBuild item group and moving the file signing information
into the Signing.props files.

Changes to in-build signing have been verified by taking a drop with the current in-build
structure and comparing the the signatures and strong name keys between files
in equivalent builds.

* Enable post build signing
Enables post build signing of installer by including the items that need to be signed
post build in an ItemsToSignPostBuild item group and moving the file signing information
into the Signing.props files.

Changes to in-build signing have been verified by taking a drop with the current in-build
structure and comparing the the signatures and strong name keys between files
in equivalent builds.

Co-authored-by: dotnet-bot <dotnet-bot@dotnetfoundation.org>
Co-authored-by: Christopher Costa <chcosta@microsoft.com>
2020-10-14 14:55:38 -07:00
Marc Paine
3505317780
Merge pull request #8775 from dotnet/marcpopMSFT-fixlinks
Fix github.io links
2020-10-14 14:39:29 -07:00
William Godbe
b4242c4896
Use SharedFx Redist package instead of Targeting Pack from AspnetCore (#8886) 2020-10-14 10:49:30 -07:00
William Godbe
69ee2fdd13
Use SharedFx Redist package instead of Targeting Pack from AspnetCore (#8887) 2020-10-14 10:44:55 -07:00
Doug Bunting
4c563d8b04
Update GenerateBundledVersions.targets 2020-10-13 12:30:21 -07:00
Daniel Plaisted
fa369e265f Update implicit versions for 3.1.9 and 2.1.23 releases 2020-10-05 16:02:49 -07:00
Marc Paine
1f5fc035c4 Fix github.io links. #8478 2020-10-01 11:52:12 -07:00
William Li
d538412053
Merge pull request #8672 from wli3/unsigned-file
Do not produce reference assembly for redist.dll
2020-09-22 21:17:49 -07:00
Jacques Eloff
2339fae27b
Merge pull request #8668 from dotnet/joeloff/SignRedist
Sign redist.dll
2020-09-22 16:29:50 -07:00
William Li
8cb5ffc7ec Do not produce reference assembly for redist.dll 2020-09-22 16:16:50 -07:00
Matt Mitchell
f56648180f
Use aspnetcore version suffix for template install directory (#8625)
This change is required for RTM stable builds. When stable versions are generated the CalculateTemplateVersions task will fail.

For .NET 3.x, installer is partially on arcade. It uses its own versioning model, but the arcade generated versions are actually set (specifically VersionSuffix). So even when stable builds are generated, VersionSuffix is available. It is unused when the aspnetcore template versions are stable.

For .NET 5, installer is now fully on arcade versioning, which means VersionSuffix is not set when stable versions are generated.

Instead of using installer's version suffix if aspnetcore's template versions are unstable, use the version suffix of the aspnetcore template versions. This subtley affects the installer directory of the templates:

If the aspnetcore version is: 5.0.0-rc.1.1234.5
And the installer version is: 5.0.100-rc.1.9999.9
Then:

Template install dir before this change: .dotnet\templates\5.0.0-rc.1.9999.9
Template install dir after this change: .dotnet\templates\5.0.0-rc.1.1234.5
Of note: The overall template layout doesn't make a ton of sense. The aspnetcore template version is used for the install directory, but many different templates are put in this directory, including some that have completely different versions.
2020-09-22 14:32:10 -07:00
Jacques Eloff
4973bec513 Sign redist.dll 2020-09-22 11:30:23 -07:00
Matt Mitchell
2e14d4e8b0
Fixes for stable builds (#8648)
- Enable the switch for stable builds
- Fixup the calculation of FullNugetVersion to not include the iteration if it is empty
2020-09-22 07:59:59 -07:00
dotnet-maestro[bot]
f88a69c889
[release/5.0.1xx-rc2] Update dependencies from dotnet/arcade (#8617)
[release/5.0.1xx-rc2] Update dependencies from dotnet/arcade


 - Update task location
2020-09-18 16:46:00 +00:00
Juan Hoyos
56b8088573
Merge branch 'release/5.0.1xx-rc2' into juhoyosa/arm64-bundled-installer 2020-09-16 12:54:37 -07:00
Juan Sebastian Hoyos Ayala
d590b93a1b Create ARM64 verision of bundle theme file to account for lack of WindowsDesktop support 2020-09-16 12:48:01 -07:00
dotnet-maestro[bot]
d240f3cfd1
[release/5.0.1xx-rc2] Update dependencies from dotnet/arcade (#8596)
[release/5.0.1xx-rc2] Update dependencies from dotnet/arcade
- Coherency Updates:
  - Microsoft.DotNet.Cli.CommandLine: from 1.0.0-preview.19208.1 to 1.0.0-preview.19208.1 (parent: Microsoft.NET.Sdk)
  - Microsoft.SourceLink.GitHub: from 1.1.0-beta-20457-02 to 1.1.0-beta-20464-02 (parent: Microsoft.DotNet.Arcade.Sdk)

 - Update create light/light command package drop task

 - Update create light/light command package drop task
2020-09-16 19:19:30 +00:00
William Li
0a5da187e0 Add VSTemplateLocator package 2020-09-16 09:59:31 -07:00
Juan Sebastian Hoyos Ayala
ce282f183a Fix casing for ARM64 platform token 2020-09-15 22:16:52 -07:00
William Godbe
af06fa7bb4
React to non-stable versioning of AspNetCore installers (#8576)
* React to non-stable versioning of AspNetCore installers

* Fix version prop
2020-09-15 16:45:52 -07:00
Pranav K
45264fac2a
Stamp runtimeconfigs with M.AspNetCore.App versions
The installer currently updates all runtimeconfig files with the M.NETCore.App version
regardless of the runtime they are targeting. This causes issues with dotnet-watch
which is targeting the AspNetCore shared runtime as of 5.0-preview8. This change
updates the targets \ task to be more discerning.
2020-09-14 10:56:23 -07:00
Juan Sebastian Hoyos Ayala
75de7b22ed ARM64 bundled installer 2020-09-11 13:10:58 -07:00
Juan Sebastian Hoyos Ayala
45ae2a0f77 Enable win-arm64 as known RID for AspNetCore 2020-09-11 13:10:58 -07:00
Juan Sebastian Hoyos Ayala
a3fc14fd2e Revert "Add arm64 as a possible WinForms arch (#7457)"
This reverts commit f1564ea07f, reversing
changes made to 0adcdc972a.
2020-09-11 13:10:57 -07:00
Pranav K
59a5ba6e73
Add 3.1 Blazor WASM templates 2020-09-08 13:42:36 -07:00
dotnet-maestro[bot]
96acacb9d4
[release/5.0.1xx-rc2] Update dependencies from dotnet/sdk (#8404)
[release/5.0.1xx-rc2] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.WindowsDesktop.App.Ref: from 5.0.0-rc.1.20431.13 to 5.0.0-rc.2.20454.1 (parent: Microsoft.NET.Sdk)
  - Microsoft.WindowsDesktop.App: from 5.0.0-rc.1.20431.13 to 5.0.0-rc.2.20454.1 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Ref: from 5.0.0-rc.1.20431.14 to 5.0.0-rc.2.20454.25 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Internal: from 5.0.0-rc.1.20431.14 to 5.0.0-rc.2.20454.25 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Runtime.win-x64: from 5.0.0-rc.1.20431.14 to 5.0.0-rc.2.20454.25 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Host.win-x64: from 5.0.0-rc.1.20431.14 to 5.0.0-rc.2.20454.25 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.DotNetHostResolver: from 5.0.0-rc.1.20431.14 to 5.0.0-rc.2.20454.25 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.Platforms: from 5.0.0-rc.1.20431.14 to 5.0.0-rc.2.20454.25 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Ref: from 5.0.0-rc.1.20451.2 to 5.0.0-rc.2.20456.3 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Runtime.win-x64: from 5.0.0-rc.1.20451.2 to 5.0.0-rc.2.20456.3 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0: from 5.0.0-rc.1.20451.2 to 5.0.0-rc.2.20456.3 (parent: Microsoft.NET.Sdk)
  - dotnet-dev-certs: from 5.0.0-rc.1.20451.2 to 5.0.0-rc.2.20456.3 (parent: Microsoft.NET.Sdk)
  - dotnet-user-secrets: from 5.0.0-rc.1.20451.2 to 5.0.0-rc.2.20456.3 (parent: Microsoft.NET.Sdk)
  - dotnet-watch: from 5.0.0-rc.1.20451.2 to 5.0.0-rc.2.20456.3 (parent: Microsoft.NET.Sdk)
  - Microsoft.Dotnet.WinForms.ProjectTemplates: from 5.0.0-rc.1.20431.1 to 5.0.0-rc.1.20451.14 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 5.0.0-rc.1.20431.13 to 5.0.0-rc.2.20454.1 (parent: Microsoft.NET.Sdk)
  - Microsoft.DotNet.Wpf.ProjectTemplates: from 5.0.0-rc.1.20431.2 to 5.0.0-rc.2.20452.6 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - Microsoft.FSharp.Compiler: from 11.0.0-beta.20428.2 to 11.0.0-beta.20457.3 (parent: Microsoft.NET.Sdk)
  - Microsoft.NET.Test.Sdk: from 16.8.0-release-20200828-02 to 16.8.0-release-20200902-05 (parent: Microsoft.NET.Sdk)
  - Microsoft.Net.Compilers.Toolset: from 3.8.0-3.20420.1 to 3.8.0-3.20454.4 (parent: Microsoft.NET.Sdk)
  - Microsoft.Build: from 16.8.0-preview-20429-01 to 16.8.0-preview-20454-01 (parent: Microsoft.NET.Sdk)
  - NuGet.Build.Tasks: from 5.8.0-preview.3.6783 to 5.8.0-preview.3.6812 (parent: Microsoft.NET.Sdk)
  - Microsoft.DotNet.Cli.CommandLine: from 1.0.0-preview.19208.1 to 1.0.0-preview.19208.1 (parent: Microsoft.NET.Sdk)

- Updates:
  - Microsoft.NET.Sdk: from 5.0.100-rc.1.20451.7 to 5.0.100-rc.2.20458.1
  - Microsoft.DotNet.MSBuildSdkResolver: from 5.0.100-rc.1.20451.7 to 5.0.100-rc.2.20458.1
  - Microsoft.WindowsDesktop.App.Ref: from 5.0.0-rc.1.20431.13 to 5.0.0-rc.2.20454.1
  - Microsoft.WindowsDesktop.App: from 5.0.0-rc.1.20431.13 to 5.0.0-rc.2.20454.1
  - Microsoft.NETCore.App.Ref: from 5.0.0-rc.1.20431.14 to 5.0.0-rc.2.20454.25
  - Microsoft.NETCore.App.Internal: from 5.0.0-rc.1.20431.14 to 5.0.0-rc.2.20454.25
  - Microsoft.NETCore.App.Runtime.win-x64: from 5.0.0-rc.1.20431.14 to 5.0.0-rc.2.20454.25
  - Microsoft.NETCore.App.Host.win-x64: from 5.0.0-rc.1.20431.14 to 5.0.0-rc.2.20454.25
  - Microsoft.NETCore.DotNetHostResolver: from 5.0.0-rc.1.20431.14 to 5.0.0-rc.2.20454.25
  - Microsoft.NETCore.Platforms: from 5.0.0-rc.1.20431.14 to 5.0.0-rc.2.20454.25
  - Microsoft.AspNetCore.App.Ref: from 5.0.0-rc.1.20451.2 to 5.0.0-rc.2.20456.3
  - Microsoft.AspNetCore.App.Runtime.win-x64: from 5.0.0-rc.1.20451.2 to 5.0.0-rc.2.20456.3
  - VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0: from 5.0.0-rc.1.20451.2 to 5.0.0-rc.2.20456.3
  - dotnet-dev-certs: from 5.0.0-rc.1.20451.2 to 5.0.0-rc.2.20456.3
  - dotnet-user-secrets: from 5.0.0-rc.1.20451.2 to 5.0.0-rc.2.20456.3
  - dotnet-watch: from 5.0.0-rc.1.20451.2 to 5.0.0-rc.2.20456.3
  - Microsoft.Dotnet.WinForms.ProjectTemplates: from 5.0.0-rc.1.20431.1 to 5.0.0-rc.1.20451.14
  - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 5.0.0-rc.1.20431.13 to 5.0.0-rc.2.20454.1
  - Microsoft.DotNet.Wpf.ProjectTemplates: from 5.0.0-rc.1.20431.2 to 5.0.0-rc.2.20452.6
  - Microsoft.FSharp.Compiler: from 11.0.0-beta.20428.2 to 11.0.0-beta.20457.3
  - Microsoft.NET.Test.Sdk: from 16.8.0-release-20200828-02 to 16.8.0-release-20200902-05
  - Microsoft.Net.Compilers.Toolset: from 3.8.0-3.20420.1 to 3.8.0-3.20454.4
  - Microsoft.Build: from 16.8.0-preview-20429-01 to 16.8.0-preview-20454-01
  - NuGet.Build.Tasks: from 5.8.0-preview.3.6783 to 5.8.0-preview.3.6812
  - Microsoft.DotNet.Cli.CommandLine: from 1.0.0-preview.19208.1 to 1.0.0-preview.19208.1

 - Exclusing all reference assemblies from crossgen

 - Removing extra /
2020-09-08 17:10:14 +00:00
Sarah Oslund
4146b548f8 Merge remote-tracking branch 'upstream/release/5.0.1xx' into MergeRC1ToRC2 2020-09-03 08:57:18 -07:00
Jacques Eloff
1e456e21c8 Ensure 3rd party assemblies are signed 2020-09-02 20:16:34 -07:00
Jacques Eloff
2a2212868d Fix license URL for PT-BR (#8374) 2020-09-02 12:16:28 -07:00
Marc Paine
a48bbcebec
Merge pull request #8371 from dotnet/marcpopMSFT-policheckRC
Update generatemsi.ps1
2020-09-01 14:35:18 -07:00
dotnet bot
f6f886a168
Update first run message (#8379) 2020-09-01 13:45:40 -07:00
Sarah Oslund
e24c5a18b0
Merge pull request #8364 from sfoslund/win4PartVersions
Updating bundled versions with 4 part windows versions
2020-09-01 11:04:45 -07:00
dotnet-maestro[bot]
b303c1b877
[release/5.0.1xx] Update dependencies from dotnet/sdk (#8370)
* Update dependencies from https://github.com/dotnet/sdk build 20200831.11

Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 5.0.100-rc.1.20431.8 -> To Version 5.0.100-rc.1.20431.11

* Update dependencies from https://github.com/dotnet/sdk build 20200831.12

Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 5.0.100-rc.1.20431.8 -> To Version 5.0.100-rc.1.20431.12

Dependency coherency updates

Microsoft.NETCore.App.Ref,Microsoft.NETCore.App.Internal,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms
 From Version 5.0.0-rc.1.20431.5 -> To Version 5.0.0-rc.1.20431.7 (parent: Microsoft.NET.Sdk

* Update dependencies from https://github.com/dotnet/sdk build 20200831.13

Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 5.0.100-rc.1.20431.8 -> To Version 5.0.100-rc.1.20431.13

Dependency coherency updates

Microsoft.NETCore.App.Ref,Microsoft.NETCore.App.Internal,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.DotNet.Common.ItemTemplates
 From Version 5.0.0-rc.1.20431.5 -> To Version 5.0.0-rc.1.20431.7 (parent: Microsoft.NET.Sdk

* Update dependencies from https://github.com/dotnet/sdk build 20200831.15

Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 5.0.100-rc.1.20431.8 -> To Version 5.0.100-rc.1.20431.15

Dependency coherency updates

Microsoft.NETCore.App.Ref,Microsoft.NETCore.App.Internal,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.DotNet.Common.ItemTemplates
 From Version 5.0.0-rc.1.20431.5 -> To Version 5.0.0-rc.1.20431.7 (parent: Microsoft.NET.Sdk

* Update dependencies from https://github.com/dotnet/sdk build 20200831.18

Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 5.0.100-rc.1.20431.8 -> To Version 5.0.100-rc.1.20431.18

Dependency coherency updates

Microsoft.NETCore.App.Ref,Microsoft.NETCore.App.Internal,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0,dotnet-dev-certs,dotnet-user-secrets,dotnet-watch,Microsoft.DotNet.Common.ItemTemplates
 From Version 5.0.0-rc.1.20431.5 -> To Version 5.0.0-rc.1.20431.7 (parent: Microsoft.NET.Sdk

* Update dependencies from https://github.com/dotnet/sdk build 20200901.1

Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 5.0.100-rc.1.20431.8 -> To Version 5.0.100-rc.1.20451.1

Dependency coherency updates

Microsoft.NETCore.App.Ref,Microsoft.NETCore.App.Internal,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0,dotnet-dev-certs,dotnet-user-secrets,dotnet-watch,Microsoft.DotNet.Common.ItemTemplates
 From Version 5.0.0-rc.1.20431.5 -> To Version 5.0.0-rc.1.20431.14 (parent: Microsoft.NET.Sdk

* Update dependencies from https://github.com/dotnet/sdk build 20200901.2

Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 5.0.100-rc.1.20431.8 -> To Version 5.0.100-rc.1.20451.2

Dependency coherency updates

Microsoft.NETCore.App.Ref,Microsoft.NETCore.App.Internal,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0,dotnet-dev-certs,dotnet-user-secrets,dotnet-watch,Microsoft.DotNet.Common.ItemTemplates
 From Version 5.0.0-rc.1.20431.5 -> To Version 5.0.0-rc.1.20431.14 (parent: Microsoft.NET.Sdk

* Update dependencies from https://github.com/dotnet/sdk build 20200901.3

Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 5.0.100-rc.1.20431.8 -> To Version 5.0.100-rc.1.20451.3

Dependency coherency updates

Microsoft.NETCore.App.Ref,Microsoft.NETCore.App.Internal,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0,dotnet-dev-certs,dotnet-user-secrets,dotnet-watch,Microsoft.DotNet.Common.ItemTemplates
 From Version 5.0.0-rc.1.20431.5 -> To Version 5.0.0-rc.1.20431.14 (parent: Microsoft.NET.Sdk

* Update dependencies from https://github.com/dotnet/sdk build 20200901.4

Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 5.0.100-rc.1.20431.8 -> To Version 5.0.100-rc.1.20451.4

Dependency coherency updates

Microsoft.WindowsDesktop.App.Ref,Microsoft.WindowsDesktop.App,Microsoft.NETCore.App.Ref,Microsoft.NETCore.App.Internal,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0,dotnet-dev-certs,dotnet-user-secrets,dotnet-watch,Microsoft.DotNet.Common.ItemTemplates,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates
 From Version 5.0.0-rc.1.20430.1 -> To Version 5.0.0-rc.1.20431.13 (parent: Microsoft.NET.Sdk

* Update dependencies from https://github.com/dotnet/sdk build 20200901.5

Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 5.0.100-rc.1.20431.8 -> To Version 5.0.100-rc.1.20451.5

Dependency coherency updates

Microsoft.WindowsDesktop.App.Ref,Microsoft.WindowsDesktop.App,Microsoft.NETCore.App.Ref,Microsoft.NETCore.App.Internal,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0,dotnet-dev-certs,dotnet-user-secrets,dotnet-watch,Microsoft.DotNet.Common.ItemTemplates,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates
 From Version 5.0.0-rc.1.20430.1 -> To Version 5.0.0-rc.1.20431.13 (parent: Microsoft.NET.Sdk

* Fix SDK toolset zip base uri

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Matt Mitchell <mmitche@microsoft.com>
2020-09-01 07:59:25 -07:00
Marc Paine
fa6078282a Update generatemsi.ps1 2020-08-31 17:09:20 -07:00
Sarah Oslund
b5732c59b2 Updating bundled versions with 4 part windows versions 2020-08-31 11:51:22 -07:00
William Li
d94c0604e7 Merge branch 'release/5.0.1xx' into merge-release/5.0.1xx-preview8-pc1 2020-08-24 14:41:42 -07:00
dotnet-maestro[bot]
8a22a19fc5
[master] Update dependencies from dotnet/sdk (#8129)
[master] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.WindowsDesktop.App.Ref: from 5.0.0-rc.1.20405.1 to 5.0.0-rc.1.20417.4 (parent: Microsoft.NET.Sdk)
  - Microsoft.WindowsDesktop.App: from 5.0.0-rc.1.20405.1 to 5.0.0-rc.1.20417.4 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Ref: from 5.0.0-rc.1.20404.16 to 5.0.0-rc.1.20417.14 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Internal: from 5.0.0-rc.1.20404.16 to 5.0.0-rc.1.20417.14 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Runtime.win-x64: from 5.0.0-rc.1.20404.16 to 5.0.0-rc.1.20417.14 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Host.win-x64: from 5.0.0-rc.1.20404.16 to 5.0.0-rc.1.20417.14 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.DotNetHostResolver: from 5.0.0-rc.1.20404.16 to 5.0.0-rc.1.20417.14 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.Platforms: from 5.0.0-rc.1.20404.16 to 5.0.0-rc.1.20417.14 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Ref: from 5.0.0-rc.1.20405.9 to 5.0.0-rc.1.20418.28 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Runtime.win-x64: from 5.0.0-rc.1.20405.9 to 5.0.0-rc.1.20418.28 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0: from 5.0.0-rc.1.20405.9 to 5.0.0-rc.1.20418.28 (parent: Microsoft.NET.Sdk)
  - dotnet-dev-certs: from 5.0.0-rc.1.20405.9 to 5.0.0-rc.1.20418.28 (parent: Microsoft.NET.Sdk)
  - dotnet-user-secrets: from 5.0.0-rc.1.20405.9 to 5.0.0-rc.1.20418.28 (parent: Microsoft.NET.Sdk)
  - dotnet-watch: from 5.0.0-rc.1.20405.9 to 5.0.0-rc.1.20418.28 (parent: Microsoft.NET.Sdk)
  - Microsoft.DotNet.Common.ItemTemplates: from 5.0.0-rc.1.20407.1 to 5.0.0-rc.1.20407.2 (parent: Microsoft.NET.Sdk)
  - Microsoft.Dotnet.WinForms.ProjectTemplates: from 5.0.0-rc.1.20370.3 to 5.0.0-rc.1.20417.1 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 5.0.0-rc.1.20405.1 to 5.0.0-rc.1.20417.4 (parent: Microsoft.NET.Sdk)
  - Microsoft.DotNet.Wpf.ProjectTemplates: from 5.0.0-rc.1.20405.1 to 5.0.0-rc.1.20417.3 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)

- Updates:
  - Microsoft.DotNet.MSBuildSdkResolver: from 5.0.100-rc.1.20407.9 to 5.0.100-rc.1.20419.19
  - Microsoft.NET.Sdk: from 5.0.100-rc.1.20407.9 to 5.0.100-rc.1.20419.19
  - Microsoft.WindowsDesktop.App.Ref: from 5.0.0-rc.1.20405.1 to 5.0.0-rc.1.20417.4
  - Microsoft.WindowsDesktop.App: from 5.0.0-rc.1.20405.1 to 5.0.0-rc.1.20417.4
  - Microsoft.NETCore.App.Ref: from 5.0.0-rc.1.20404.16 to 5.0.0-rc.1.20417.14
  - Microsoft.NETCore.App.Internal: from 5.0.0-rc.1.20404.16 to 5.0.0-rc.1.20417.14
  - Microsoft.NETCore.App.Runtime.win-x64: from 5.0.0-rc.1.20404.16 to 5.0.0-rc.1.20417.14
  - Microsoft.NETCore.App.Host.win-x64: from 5.0.0-rc.1.20404.16 to 5.0.0-rc.1.20417.14
  - Microsoft.NETCore.DotNetHostResolver: from 5.0.0-rc.1.20404.16 to 5.0.0-rc.1.20417.14
  - Microsoft.NETCore.Platforms: from 5.0.0-rc.1.20404.16 to 5.0.0-rc.1.20417.14
  - Microsoft.AspNetCore.App.Ref: from 5.0.0-rc.1.20405.9 to 5.0.0-rc.1.20418.28
  - Microsoft.AspNetCore.App.Runtime.win-x64: from 5.0.0-rc.1.20405.9 to 5.0.0-rc.1.20418.28
  - VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0: from 5.0.0-rc.1.20405.9 to 5.0.0-rc.1.20418.28
  - dotnet-dev-certs: from 5.0.0-rc.1.20405.9 to 5.0.0-rc.1.20418.28
  - dotnet-user-secrets: from 5.0.0-rc.1.20405.9 to 5.0.0-rc.1.20418.28
  - dotnet-watch: from 5.0.0-rc.1.20405.9 to 5.0.0-rc.1.20418.28
  - Microsoft.DotNet.Common.ItemTemplates: from 5.0.0-rc.1.20407.1 to 5.0.0-rc.1.20407.2
  - Microsoft.Dotnet.WinForms.ProjectTemplates: from 5.0.0-rc.1.20370.3 to 5.0.0-rc.1.20417.1
  - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 5.0.0-rc.1.20405.1 to 5.0.0-rc.1.20417.4
  - Microsoft.DotNet.Wpf.ProjectTemplates: from 5.0.0-rc.1.20405.1 to 5.0.0-rc.1.20417.3

 - Address corssgen target issues

 - Merge branch 'darc-master-2e4e2d61-f78f-4bde-8947-ee1fee18e9a9' of https://github.com/dotnet/core-sdk into darc-master-2e4e2d61-f78f-4bde-8947-ee1fee18e9a9

 - Merge branch 'master' of https://github.com/dotnet/core-sdk into darc-master-2e4e2d61-f78f-4bde-8947-ee1fee18e9a9
2020-08-20 03:40:36 +00:00
Matt Mitchell
dc972b079f
Add light command packages gathering (#8191)
Call tasks to gather light command packages after the build of each
installer. The way this is implemented is not ideal. Because powershell
scripts are used to invoke the WiX toolset, the light command package
info must be kept in sync. That said, the command lines and input files
do not change very often.

It's also on the table for .NET 6 to change around and unify the WiX
calls between the repos.

This also changes around the batching for the template MSIs to be compatible
with the call to the light command task
2020-08-19 11:58:16 -07:00
William Li
ad6a4b6f56
Update implicit version for 3.1 runtime (#8164) 2020-08-14 08:58:20 -07:00
Matt Mitchell
91bf9b371c
Update min VS version in installer info (#8157) 2020-08-13 21:25:50 -07:00
Matt Mitchell
e4ad1969d3
Fixup license paths (#8160)
dummyeula.rtf is in the same location as the PS scripts
2020-08-13 12:51:33 -07:00
Matt Mitchell
99ee62375d Update min VS version in installer info 2020-08-13 09:59:48 -07:00
Jacques Eloff
06e4f20fb9 Ensure rzc.dll and PresentationBuildTasks.dll are signed 2020-08-11 14:23:35 -07:00
Jacques Eloff
05203da281 Ensure rzc.dll and PresentationBuildTasks.dll are signed after running crossgen 2020-08-11 11:07:31 -07:00
Sarah Oslund
eeef3c72e8 PR feedback 2020-08-05 10:20:22 -07:00
Sarah Oslund
ace6e859e7 Dynamically acquire branch info, remove branchinfo.props 2020-08-03 16:02:18 -07:00
Matt Mitchell
2195668cc4 Update channel 2020-07-15 13:44:35 -07:00
William Li
7aaf0d85d0 Add in cswinrt KnownFrameworkReference 2020-07-07 15:06:06 -07:00
Matt Mitchell
1f2fb0525f
Make some artifacts non-shipping (#7857)
Makes the following artifacts non-shipping:
- template msis
- sdkplaceholders
- sdk-internal archives

For now these have been preserved as non-shipping rather than not published at all.
They all get packaged up in the VS insertion nupkgs, so I think in reality we don't need them at all.
2020-06-25 11:36:38 -07:00
Matt Mitchell
85de1d64f7
Enable TLS1.2 in the generatenupkg step (#7833) 2020-06-19 08:49:35 -07:00
Juan Hoyos
f1564ea07f
Add arm64 as a possible WinForms arch (#7457)
* Add arm64 as a possible WinForms arch
* Add Winforms RT assets to shared and WindowsDesktop refs to ARM64 SDK
* Add ARM WindowsDesktop tests
2020-05-18 15:25:42 -07:00
Nikola Milosavljevic
0c591aede6
Merge pull request #7461 from NikolaMilosavljevic/ui.license
UI changes for .NET 5
2020-05-15 08:55:57 -07:00
Daniel Plaisted
9260c1cd14 Don't include ios, tvos, android, and browser RIDs for AppHosts 2020-05-14 10:39:46 -07:00
Alexander Köplinger
7931ca0ea1
Add browser-wasm and ios-x86 to .NET 5 runtime pack IDs (#7459)
Same as https://github.com/dotnet/installer/pull/7034
2020-05-13 23:46:29 +02:00
Nikola Milosavljevic (CLR)
4b0c84901a Update line endings 2020-05-13 13:07:27 -07:00
Nikola Milosavljevic (CLR)
11da7bddd8 UI changes for .NET 5 2020-05-13 06:26:10 -07:00
Juan Sebastian Hoyos Ayala
ad389aa073 Add Winforms RT assets to shared and WindowsDesktop refs to ARM64 SDK 2020-05-12 23:19:25 -07:00
Juan Sebastian Hoyos Ayala
e339d60b25 Add arm64 as a possible WinForms arch
Makes it possible to build/publish arm64 winforms app. WPF/Full Winforms+WPF should still fail as a build time scenario.
2020-05-12 19:00:13 -07:00
Eric Erhardt
efe7c8e566
Remove references to PlatformAbstractions. (#7408)
* Remove references to PlatformAbstractions.

This will allow us to remove the PlatformAbstractions library from dotnet/runtime.

Contributes to https://github.com/dotnet/runtime/issues/3470
2020-05-06 09:59:23 -05:00
William Li
ad590737e6 Correct remove WinForms logic 2020-04-30 15:28:15 -07:00
Matt Mitchell
3c6fe698ef [release/5.0.1xx-preview4] Generate versions sparsely (#7290)
* Publish productVersion sparsely
Do not publish the productVersion file in every leg. Publish only in win-x64,
so that we don't end up uploading it for every manifest. Publishing breaks in this scenario today.
This is a real bug in publishing, but we will probably tighten the restrictions in the
Publish to BAR step so that multi-publishign the same asset is an error.

Also remove the productCommit-* in cases where we have overlapping rids, which would cause the same problem
2020-04-27 08:06:24 -07:00
William Li
e93e74c7a7
Merge pull request #7119 from wli3/sign-Interactive.DependencyManager-master
Interactive.DependencyManager to sign files
2020-04-17 13:46:24 -07:00
William Li
ea3803ddf1 Correct tool path append 2020-04-12 20:47:01 -07:00
William Li
e6be6629bf Interactive.DependencyManager to sign files 2020-04-11 18:29:27 -07:00
Brian Robbins
0a51c1a44d Exclude desktop assemblies from crossgen. 2020-04-09 11:48:42 -07:00
Sarah Oslund
58e48acdbb
Merge pull request #7055 from sfoslund/UpdateReleaseNotes
Updating release notes url to net 5
2020-04-09 08:13:25 -07:00
Matt Mitchell
337f953a95 Revert incorrect changes 2020-04-08 13:12:41 -07:00
Matt Mitchell
eaf4ea023f Merge remote-tracking branch 'upstream/release/5.0.1xx-preview3' into merge/release/5.0.1xx-preview3-to-master 2020-04-08 13:12:12 -07:00
Matt Mitchell
f5e7d53b35
[release/5.0.1xx-preview3] Set up TLS 1.2 before calling dotnet-install for tests (#7068)
* Set TLS1.2 before running dotnet-install in tests
The new powershell process overrides the setting that build.ps1 sets up.

* Reduce logging verbosity
2020-04-08 13:07:50 -07:00
Matt Mitchell
6e7661bb24
Merge branch 'master' into merge/release/5.0.1xx-preview3-to-master 2020-04-08 13:04:15 -07:00
Sarah Oslund
67216ce780 Updating release notes url to net 5 2020-04-07 12:27:58 -07:00
Daniel Plaisted
f86d955689
Merge pull request #7034 from akoeplinger/add-ios-net5-runtimepacks
Add iOS/tvOS/Android to .NET5 runtime pack IDs
2020-04-07 08:42:00 -07:00
Alexander Köplinger
9fdf00af10 Add Android to .NET5 runtime pack IDs 2020-04-06 17:39:02 +02:00
Alexander Köplinger
8289cde9a0 Add tvOS to .NET5 runtime pack IDs 2020-04-06 17:38:50 +02:00
Alexander Köplinger
6de5203c5d Add iOS to .NET5 runtime pack IDs 2020-04-03 18:05:45 +02:00
Matt Mitchell
3ee962859a Update channel info and stage dependencies for preview3 2020-03-31 15:40:49 -07:00
Daniel Plaisted
30b2fc31c2
Merge pull request #6993 from mmitche/generate-checksums-using-new-arcade-task
Generate checksums using new arcade task
2020-03-31 14:10:07 -07:00
Sarah Oslund
0e7109c16e Adding crossgen support for win-arm64 builds 2020-03-30 14:28:22 -07:00
William Li
d98f5f18bc
Merge pull request #6934 from wli3/merge-master-3.1.3xx
Merge master 3.1.3xx
2020-03-29 22:26:33 -07:00
Sarah Oslund
90b6ea7124
Merge pull request #6933 from sfoslund/DefaultRuntimeVersions
Automatic handling of DefaultRuntimeFrameworkVersion
2020-03-27 11:11:46 -07:00
Sarah Oslund
5d76891b2d Updating DefaultRuntimeFrameworkVersion property names 2020-03-27 08:51:50 -07:00
Bekir Ozturk
819cc4834b Used builtin write-to-file task 2020-03-27 16:17:22 +01:00
Bekir Ozturk
e48b81f37e Generating a productCommit for each rid 2020-03-27 13:49:29 +01:00
Bekir Ozturk
af2f259998 productCommit.txt data order change 2020-03-27 12:53:28 +01:00
Bekir Ozturk
69c37ccd97 Fix: directory not found issue 2020-03-27 00:23:50 +01:00
Bekir Ozturk
39188f8297 Fix: directory not found issue 2020-03-27 00:12:11 +01:00
Bekir Ozturk
e8c7fe0c9c Fix: directory not found issue 2020-03-27 00:06:34 +01:00
Bekir Ozturk
3b618215eb Removed new line at the end 2020-03-26 23:50:42 +01:00
Matt Mitchell
bbec23f976 Generate checksums using new arcade task 2020-03-26 15:18:36 -07:00
Bekir Ozturk
996babd3f6 productVersion filename and content change 2020-03-26 21:32:21 +01:00
William Li
05be3f49cf Merge branch 'release/3.1.1xx' into merge-master-3.1.3xx 2020-03-26 12:12:04 -07:00
Sarah Oslund
5b24650ff9 Removing unused UseBundledNETCoreAppPackageVersionAsDefaultNetCorePatchVersion property 2020-03-26 11:35:24 -07:00
Sarah Oslund
8cc89ea7e5 Adding automatic generation of DefaultRuntimeFrameworkVersions 2020-03-26 10:01:21 -07:00
Daniel Plaisted
a199c488d7 Merge upstream changes 2020-03-25 11:03:43 -07:00
William Li
ae8a1c85d2
Merge pull request #6906 from dsplaisted/merge-5.0-preview1-to-preview2
Merge 5.0 preview1 to preview2
2020-03-24 17:30:15 -07:00
msftbot[bot]
ba203165fd
Merge pull request #6795 from sfoslund/UpdatePatches
Updating to 2.1.17 patch version
2020-03-24 22:03:27 +00:00
Daniel Plaisted
bf9b02831b Merge 5.0.1xx-preview1 changes 2020-03-24 11:56:33 -07:00
Viktor Hofer
cfbb4fa36f
Revert "Update web templates for preview2 (#6860)" (#6902)
This reverts commit 0d8d4288ac.
2020-03-24 10:39:45 -07:00
Daniel Plaisted
8b76f8dc98
Merge pull request #6844 from brianrob/disable_partial_crossgen
Disable Partial Crossgen and Crossgen More Binaries
2020-03-23 13:55:33 -07:00
dotnet-maestro[bot]
02ee648fc6
[master] Update dependencies from dotnet/sdk (#6774)
* Update dependencies from https://github.com/dotnet/sdk build 20200311.2

- Microsoft.DotNet.MSBuildSdkResolver - 5.0.100-preview.3.20161.2
- Microsoft.NET.Sdk - 5.0.100-preview.3.20161.2

* Update dependencies from https://github.com/dotnet/sdk build 20200311.4

- Microsoft.DotNet.MSBuildSdkResolver - 5.0.100-preview.3.20161.4
- Microsoft.NET.Sdk - 5.0.100-preview.3.20161.4

* Update dependencies from https://github.com/dotnet/sdk build 20200311.6

- Microsoft.DotNet.MSBuildSdkResolver - 5.0.100-preview.3.20161.6
- Microsoft.NET.Sdk - 5.0.100-preview.3.20161.6

* Update dependencies from https://github.com/dotnet/sdk build 20200311.7

- Microsoft.DotNet.MSBuildSdkResolver - 5.0.100-preview.3.20161.7
- Microsoft.NET.Sdk - 5.0.100-preview.3.20161.7

* Update dependencies from https://github.com/dotnet/sdk build 20200312.1

- Microsoft.DotNet.MSBuildSdkResolver - 5.0.100-preview.3.20162.1
- Microsoft.NET.Sdk - 5.0.100-preview.3.20162.1

* Update dependencies from https://github.com/dotnet/sdk build 20200312.2

- Microsoft.DotNet.MSBuildSdkResolver - 5.0.100-preview.3.20162.2
- Microsoft.NET.Sdk - 5.0.100-preview.3.20162.2

* Update dependencies from https://github.com/dotnet/sdk build 20200312.3

- Microsoft.DotNet.MSBuildSdkResolver - 5.0.100-preview.3.20162.3
- Microsoft.NET.Sdk - 5.0.100-preview.3.20162.3

* Update dependencies from https://github.com/dotnet/sdk build 20200312.5

- Microsoft.DotNet.MSBuildSdkResolver - 5.0.100-preview.3.20162.5
- Microsoft.NET.Sdk - 5.0.100-preview.3.20162.5

* Update dependencies from https://github.com/dotnet/sdk build 20200312.7

- Microsoft.DotNet.MSBuildSdkResolver - 5.0.100-preview.3.20162.7
- Microsoft.NET.Sdk - 5.0.100-preview.3.20162.7

* Update dependencies from https://github.com/dotnet/sdk build 20200312.9

- Microsoft.DotNet.MSBuildSdkResolver - 5.0.100-preview.3.20162.9
- Microsoft.NET.Sdk - 5.0.100-preview.3.20162.9

* Update dependencies from https://github.com/dotnet/sdk build 20200313.1

- Microsoft.DotNet.MSBuildSdkResolver - 5.0.100-preview.3.20163.1
- Microsoft.NET.Sdk - 5.0.100-preview.3.20163.1

* Update dependencies from https://github.com/dotnet/sdk build 20200313.2

- Microsoft.DotNet.MSBuildSdkResolver - 5.0.100-preview.3.20163.2
- Microsoft.NET.Sdk - 5.0.100-preview.3.20163.2

* Update dependencies from https://github.com/dotnet/sdk build 20200313.3

- Microsoft.DotNet.MSBuildSdkResolver - 5.0.100-preview.3.20163.3
- Microsoft.NET.Sdk - 5.0.100-preview.3.20163.3

* Update dependencies from https://github.com/dotnet/sdk build 20200315.1

- Microsoft.DotNet.MSBuildSdkResolver - 5.0.100-preview.3.20165.1
- Microsoft.NET.Sdk - 5.0.100-preview.3.20165.1

* Update dependencies from https://github.com/dotnet/sdk build 20200315.3

- Microsoft.DotNet.MSBuildSdkResolver - 5.0.100-preview.3.20165.3
- Microsoft.NET.Sdk - 5.0.100-preview.3.20165.3

* Update dependencies from https://github.com/dotnet/sdk build 20200317.2

- Microsoft.DotNet.MSBuildSdkResolver - 5.0.100-preview.3.20167.2
- Microsoft.NET.Sdk - 5.0.100-preview.3.20167.2

* Update dependencies from https://github.com/dotnet/sdk build 20200317.3

- Microsoft.DotNet.MSBuildSdkResolver - 5.0.100-preview.3.20167.3
- Microsoft.NET.Sdk - 5.0.100-preview.3.20167.3

* Update dependencies from https://github.com/dotnet/sdk build 20200317.5

- Microsoft.DotNet.MSBuildSdkResolver - 5.0.100-preview.3.20167.5
- Microsoft.NET.Sdk - 5.0.100-preview.3.20167.5

* Update dependencies from https://github.com/dotnet/sdk build 20200317.8

- Microsoft.DotNet.MSBuildSdkResolver - 5.0.100-preview.3.20167.8
- Microsoft.NET.Sdk - 5.0.100-preview.3.20167.8

* Update dependencies from https://github.com/dotnet/sdk build 20200318.1

- Microsoft.DotNet.MSBuildSdkResolver - 5.0.100-preview.3.20168.1
- Microsoft.NET.Sdk - 5.0.100-preview.3.20168.1

* Update dependencies from https://github.com/dotnet/sdk build 20200318.2

- Microsoft.DotNet.MSBuildSdkResolver - 5.0.100-preview.3.20168.2
- Microsoft.NET.Sdk - 5.0.100-preview.3.20168.2

* Update dependencies from https://github.com/dotnet/sdk build 20200318.6

- Microsoft.DotNet.MSBuildSdkResolver - 5.0.100-preview.3.20168.6
- Microsoft.NET.Sdk - 5.0.100-preview.3.20168.6

* Update dependencies from https://github.com/dotnet/sdk build 20200318.7

- Microsoft.DotNet.MSBuildSdkResolver - 5.0.100-preview.3.20168.7
- Microsoft.NET.Sdk - 5.0.100-preview.3.20168.7

* Update dependencies from https://github.com/dotnet/sdk build 20200318.8

- Microsoft.DotNet.MSBuildSdkResolver - 5.0.100-preview.3.20168.8
- Microsoft.NET.Sdk - 5.0.100-preview.3.20168.8

* Update dependencies from https://github.com/dotnet/sdk build 20200318.9

- Microsoft.DotNet.MSBuildSdkResolver - 5.0.100-preview.3.20168.9
- Microsoft.NET.Sdk - 5.0.100-preview.3.20168.9

* Update dependencies from https://github.com/dotnet/sdk build 20200318.10

- Microsoft.DotNet.MSBuildSdkResolver - 5.0.100-preview.3.20168.10
- Microsoft.NET.Sdk - 5.0.100-preview.3.20168.10

* Update dependencies from https://github.com/dotnet/sdk build 20200319.1

- Microsoft.DotNet.MSBuildSdkResolver - 5.0.100-preview.3.20169.1
- Microsoft.NET.Sdk - 5.0.100-preview.3.20169.1

* Update dependencies from https://github.com/dotnet/sdk build 20200319.2

- Microsoft.DotNet.MSBuildSdkResolver - 5.0.100-preview.3.20169.2
- Microsoft.NET.Sdk - 5.0.100-preview.3.20169.2

* Update dependencies from https://github.com/dotnet/sdk build 20200319.3

- Microsoft.DotNet.MSBuildSdkResolver - 5.0.100-preview.3.20169.3
- Microsoft.NET.Sdk - 5.0.100-preview.3.20169.3

* Update dependencies from https://github.com/dotnet/sdk build 20200319.4

- Microsoft.DotNet.MSBuildSdkResolver - 5.0.100-preview.3.20169.4
- Microsoft.NET.Sdk - 5.0.100-preview.3.20169.4

* Update dependencies from https://github.com/dotnet/sdk build 20200320.1

- Microsoft.DotNet.MSBuildSdkResolver - 5.0.100-preview.3.20170.1
- Microsoft.NET.Sdk - 5.0.100-preview.3.20170.1

* Partially reordered paths passed to crossgen

* Update dependencies from https://github.com/dotnet/sdk build 20200320.2

- Microsoft.DotNet.MSBuildSdkResolver - 5.0.100-preview.3.20170.2
- Microsoft.NET.Sdk - 5.0.100-preview.3.20170.2

* Partially reordered paths passed to crossgen

* Partially reordered paths passed to crossgen

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Bekir Ozturk <bozturk@microsoft.com>
2020-03-20 21:42:20 +00:00
Viktor Hofer
0d8d4288ac
Update web templates for preview2 (#6860)
* Update web templates for preview2

Updating the web templates to a pinned version for preview2 until https://github.com/dotnet/aspnetcore/pull/19860 is resolved.
2020-03-19 09:52:31 +01:00
William Li
320e530464 Fix deb failure 2020-03-17 22:47:45 -07:00
sfoslund
e9f56dda48 Updating to 2.1.17 patch version 2020-03-17 15:56:20 -07:00
Brian Robbins
500ed50b31 Add more assemblies to the crossgen list. 2020-03-17 13:48:39 -07:00
Brian Robbins
ab98cad0e2 Specify -MissingDependenciesOK to crossgen. 2020-03-17 13:48:18 -07:00
Sarah Oslund
8ab3f42d20
Merge pull request #6836 from sfoslund/PortWinArm64
Adding support for win arm64 builds
2020-03-17 13:05:17 -07:00
Zbyněk Sailer (Moravia IT)
9e1f0e20a0 LOC CHECKIN | dotnet/core-sdk 5.0.1xx-preview1 | 20200317 2020-03-17 15:38:36 +01:00
Juan Hoyos
5b1ee5c1f5
[skip ci] Publish latest to preview2 specific channel 2020-03-16 13:45:51 -07:00
sfoslund
2deda3ae53 Adding support for win arm64 builds 2020-03-16 12:45:01 -07:00
sfoslund
d0b5a76c82 Updating to 2.1.17 patch version 2020-03-12 13:02:10 -07:00
Brian Robbins
e87acd73ac Disable partial NGEN. 2020-03-11 17:38:41 -07:00
sfoslund
2de8411fd3 Updating installer learn more links to 5.0 release notes 2020-03-11 14:45:36 -07:00
William Li
92129ee125
Merge pull request #6743 from NikolaMilosavljevic/osx.13
Update minimum supported OSX version to 10.13
2020-03-11 10:25:37 -07:00
Sarah Oslund
c0b921a789
Merge pull request #6753 from sfoslund/UpdateBundledVersions
Updating 3.1.x default runtime versions
2020-03-11 05:35:31 +08:00
Sarah Oslund
6f9a146a06
Merge pull request #6740 from sfoslund/WinArm64Build
Add Win-arm64 Leg
2020-03-11 01:32:00 +08:00
sfoslund
b1a65c534b Updating 3.1.x default runtime versions 2020-03-10 10:07:39 -07:00
Nikola Milosavljevic (CLR)
7321a05a35 Update minimum supported OSX version to 10.13 2020-03-09 13:17:14 -07:00
sfoslund
660fd7a768 Adding support for win arm64 builds 2020-03-06 15:51:55 -08:00
Matt Mitchell
7756948a8c Merge remote-tracking branch 'upstream/release/5.0.1xx-preview1' into merge-from-5.0 2020-03-05 11:11:30 -08:00
Matt Mitchell
1c44853056
Updating 3.1.x bundle versions (#6674) 2020-03-05 09:44:46 -08:00
Nick Guerrera
dd8802ee6d Fix toolset ingestion URL 2020-03-04 08:57:11 -08:00
William Li
94932e9f86
Add 5.0 templates (#6647) 2020-03-02 13:23:21 -08:00
Nick Guerrera
175ab37f20 Merge branch 'release/5.0.1xx-preview1' into merge-50p1 2020-02-28 14:27:38 -08:00
William Li
d46ee00032
Add 5.0 template (#6583)
* Add 5.0 templates to template/5.0 folder
2020-02-27 13:25:10 -08:00
Sarah Oslund
22192f3d37
Merge pull request #6558 from sfoslund/UpdateBranding
Updating installer branding
2020-02-27 12:49:22 -08:00
sfoslund
c5a1a3c006 Updating installation note with proper versions 2020-02-27 11:13:56 -08:00
Michael Simons
ef4011b55a
Update BranchInfo channel for release/5.0.1xx-preview1 branch (#6574) 2020-02-26 08:18:05 -08:00
Phil Henning
7ddc5746f3 Add 5.0 common project templates to Bundle. 2020-02-25 07:00:13 -08:00
sfoslund
c169c1c426 Updating installer branding 2020-02-24 15:34:30 -08:00
dotnet-maestro[bot]
664dc77bc1
[release/3.1.1xx] Update dependencies from dotnet/aspnetcore (#6506)
* Update dependencies from https://github.com/dotnet/aspnetcore build 20200220.11

- dotnet-watch - 3.1.3-servicing.20120.11
- dotnet-user-secrets - 3.1.3-servicing.20120.11
- dotnet-dev-certs - 3.1.3-servicing.20120.11
- Microsoft.AspNetCore.App.Ref - 3.1.3
- Microsoft.AspNetCore.App.Runtime.win-x64 - 3.1.3
- Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.1.3-servicing.20120.11

Dependency coherency updates

- Microsoft.DotNet.MSBuildSdkResolver - 3.1.103-servicing.20120.3 (parent: Microsoft.Dotnet.Toolset.Internal)

* Update GenerateLayout.targets

Co-authored-by: William Godbe <wigodbe@microsoft.com>
2020-02-21 04:31:51 +00:00
Nick Guerrera
c6b041e78c Fix merge issues with templates 2020-02-19 15:43:20 -08:00
Nick Guerrera
03963a5788 Merge branch 'release/5.0.1xx-preview1' into merge/release/3.1.2xx-to-master 2020-02-19 13:50:39 -08:00
Daniel Plaisted
2a8f6d1b34 Update 2.1 implicit versions 2020-02-19 11:00:34 -08:00
Daniel Plaisted
113d03bcb5
Update branding to 3.1.103 2020-02-13 16:41:46 -08:00
Fadi Hanna
645fdc4bc6
Fix formatting bug for crossgen2's supported RIDs (#6302) 2020-02-06 13:01:19 -08:00
William Li
288bb5c8b6 Remove all reference to 21 template 2020-02-05 22:16:55 -08:00
William Godbe
6dc2944d31
Revert to 3.1.1 runtime (#6272)
* Revert to 3.1.1 runtime

* use 3.1.1 version of GenerateLayout.targets
2020-02-03 10:46:25 -08:00
Nick Guerrera
573d158fea
[3.1.1xx] Bump self-contained default for 3.0.x and 2.1.x (#6268)
* Bump self-contained default for 3.0.x and 2.1.x

* Add 3.0.3 feeds for tests
2020-01-30 16:18:56 -08:00
Fadi Hanna
63e9316a15
Add a KnownCrossgen2Pack entry for the crossgen2 compiler packages (#6227) 2020-01-30 16:16:07 -08:00
msftbot[bot]
2f3fb6ea5e
Merge pull request #6242 from wli3/fix-msi-gg
Fix msi non-deterministic ComponentId
2020-01-28 21:07:00 +00:00
William Li
3e8b475e2f Cap major 5 2020-01-28 12:35:25 -08:00
William Li
df09f07394 Finish ComponentID reset 2020-01-28 12:35:16 -08:00
William Li
fdda58e6ff Use nuget version to better reduce code 2020-01-28 12:35:09 -08:00
William Li
b76a641e4f Use Task to calculate template versions
No behaivor change
2020-01-28 12:35:01 -08:00
William Li
24ffef0659 Remove -gg in harvest 2020-01-28 12:34:51 -08:00
William Li
90b13626ab Cap major 5 2020-01-28 12:33:43 -08:00
William Li
8b9a67d117 Finish ComponentID reset 2020-01-25 17:33:21 -08:00
William Li
38ff5b6af1 Use nuget version to better reduce code 2020-01-25 17:15:10 -08:00
William Li
0806ef1bd1 Use Task to calculate template versions
No behaivor change
2020-01-25 16:40:47 -08:00
sfoslund
46b8ddf0b5 Reverting drop suffix change 2020-01-21 11:24:22 -08:00
Sarah Oslund
672d0ec1e2 Merge branch 'release/3.1.1xx' into Merging3.1And3.2 2020-01-21 08:40:01 -08:00
William Li
252416a21a Remove -gg in harvest 2020-01-19 08:53:28 -08:00
dotnet-maestro[bot]
56ce343ea2
[release/3.1.1xx] Update dependencies from dotnet/aspnetcore (#6162)
* Update dependencies from https://github.com/dotnet/aspnetcore build 20200116.1

- dotnet-user-secrets - 3.1.2-servicing.20066.1
- dotnet-watch - 3.1.2-servicing.20066.1
- Microsoft.AspNetCore.App.Ref - 3.1.2
- Microsoft.AspNetCore.App.Runtime.win-x64 - 3.1.2
- dotnet-dev-certs - 3.1.2-servicing.20066.1
- Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.1.2-servicing.20066.1

* Update dependencies from https://github.com/dotnet/aspnetcore build 20200116.4

- dotnet-user-secrets - 3.1.2-servicing.20066.4
- dotnet-watch - 3.1.2-servicing.20066.4
- Microsoft.AspNetCore.App.Ref - 3.1.2
- Microsoft.AspNetCore.App.Runtime.win-x64 - 3.1.2
- dotnet-dev-certs - 3.1.2-servicing.20066.4
- Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.1.2-servicing.20066.4

* Update dependencies from https://github.com/dotnet/aspnetcore build 20200116.14

- dotnet-user-secrets - 3.1.2-servicing.20066.14
- dotnet-watch - 3.1.2-servicing.20066.14
- Microsoft.AspNetCore.App.Ref - 3.1.2
- Microsoft.AspNetCore.App.Runtime.win-x64 - 3.1.2
- dotnet-dev-certs - 3.1.2-servicing.20066.14
- Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.1.2-servicing.20066.14

* Update dependencies from https://github.com/dotnet/aspnetcore build 20200116.15

- dotnet-user-secrets - 3.1.2-servicing.20066.15
- dotnet-watch - 3.1.2-servicing.20066.15
- Microsoft.AspNetCore.App.Ref - 3.1.2
- Microsoft.AspNetCore.App.Runtime.win-x64 - 3.1.2
- dotnet-dev-certs - 3.1.2-servicing.20066.15
- Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.1.2-servicing.20066.15

* Update dependencies from https://github.com/dotnet/aspnetcore build 20200117.1

- dotnet-user-secrets - 3.1.2-servicing.20067.1
- dotnet-watch - 3.1.2-servicing.20067.1
- Microsoft.AspNetCore.App.Ref - 3.1.2
- Microsoft.AspNetCore.App.Runtime.win-x64 - 3.1.2
- dotnet-dev-certs - 3.1.2-servicing.20067.1
- Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.1.2-servicing.20067.1

* Update dependencies from https://github.com/dotnet/aspnetcore build 20200117.4

- dotnet-user-secrets - 3.1.2-servicing.20067.4
- dotnet-watch - 3.1.2-servicing.20067.4
- Microsoft.AspNetCore.App.Ref - 3.1.2
- Microsoft.AspNetCore.App.Runtime.win-x64 - 3.1.2
- dotnet-dev-certs - 3.1.2-servicing.20067.4
- Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.1.2-servicing.20067.4

* Update dependencies from https://github.com/dotnet/aspnetcore build 20200118.1

- dotnet-dev-certs - 3.1.2-servicing.20068.1
- dotnet-user-secrets - 3.1.2-servicing.20068.1
- dotnet-watch - 3.1.2-servicing.20068.1
- Microsoft.AspNetCore.App.Ref - 3.1.2
- Microsoft.AspNetCore.App.Runtime.win-x64 - 3.1.2
- Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.1.2-servicing.20068.1

* Update AspNetCoreTargetingPackBlobVersion to 3.1.2

* fixup AspNetCoreTargetingPackBlobVersion

* Use property

* don't use property

Co-authored-by: William Godbe <wigodbe@microsoft.com>
2020-01-18 21:31:47 +00:00
Sarah Oslund
cb71d005c1 Merge branch 'release/3.1.1xx' into release/3.1.2xx 2020-01-15 09:42:07 -08:00
Sarah Oslund
0a4f5e443d Merge branch 'release/3.1.2xx' 2020-01-15 09:23:07 -08:00
Daniel Plaisted
8131a95fc2 Bump branding to 3.1.102 2020-01-14 19:34:03 -08:00
Nick Guerrera
8d13410014 Bump 2.1.x implicit versions
Disable SDK tests that do 2.1.x self-contained

Delete GivenSelfContainedAppsRollForward. It doesn't work with 3.x+ already and won't work with 2.x MSRCs.
2020-01-14 17:45:28 -08:00
Livar Cunha
688644d44e Did a hack where we are writing the version to a file during build to be read during publish, as these are two separate builds by arcade and also passed the BuildNumberId so that the id is calculated properly during copy to latest. 2020-01-09 21:13:46 -08:00
Livar Cunha
befcc966a5 Moving the GitCommitHash code to a target to be shared amongst a couple of other targets. 2020-01-09 12:52:53 -08:00
Livar Cunha
ca6e86d472 Move GenerateFullNuGetVersion to a different target to be shared by build, publish and publish to latest. 2020-01-09 11:31:14 -08:00
William Li
2253434a97
Merge pull request #5931 from dotnet-maestro-bot/merge/release/3.1.1xx-to-release/3.1.2xx
[automated] Merge branch 'release/3.1.1xx' => 'release/3.1.2xx'
2020-01-08 15:05:45 -08:00
Livar Cunha
83679698f9 Updated all MSIs to use the GenerateMsiVersion task and also moved the generation of FullNuGetVersion to a target because it depends on things happening in BeforeCommons.targets of Arcade. 2020-01-03 15:49:06 -08:00
Livar Cunha
56c36dfd3a Fallback to commitcount for msi version when doing builds in CI or locally. For official builds it will use the patch number calculated by arcade. 2019-12-26 10:40:20 -08:00
Livar Cunha
34b644977c Use _PatchNumber from arcade instead of commit count. Fixes msi generation and changes VersionPatch to VersionFeature. 2019-12-23 15:18:07 -08:00
Livar Cunha
57dd97f02a Adding back commit count for msi calculation. I believe we will need to change that to avoid colisions. 2019-12-20 15:58:08 -08:00
Livar Cunha
72f288ab58 Switching from using commit height for versioning to using Arcade's scheme. 2019-12-20 13:19:56 -08:00
dotnet-bot
b377529961 Merge in 'release/3.1.1xx' changes 2019-12-19 21:58:17 +00:00
Nick Guerrera
7d2bade6ec
Use suffixed location for 3.1.0 TP download (#5930)
Use the suffixed location for the TP download.
Change back later.

Co-authored-by: Matt Mitchell <mmitche@microsoft.com>
2019-12-19 13:56:42 -08:00
William Li
d82cde6315 Fix merge 2019-12-17 21:37:59 -08:00
William Li
4e1ba631b8 Merge branch 'release/3.1.2xx' 2019-12-17 21:34:27 -08:00
Nick Guerrera
ac7c03ce2a Merged PR 4935: Bump 2.1.x and 3.0.x versions for SCD; use 3.1.0 for FDD 2019-12-17 01:05:32 +00:00
Matt Mitchell
a8cef816ed Stabilize package versions 2019-12-16 14:47:54 -08:00
Nick Guerrera
b925821a07 Bump to 3.0.2 for SCD; use 3.1.0 for SCD 2019-12-16 14:08:20 -08:00
DotNet Bot
e5837fa361 Merge pull request 4898 from darc-internal/release/3.1.1xx-1a8919d3-cda2-437b-9784-4b0111084702 into internal/release/3.1.1xx 2019-12-16 22:08:02 +00:00
Nick Guerrera
784091d577 Bump 2.1.x implicit versions
Disable SDK tests that do 2.1.x self-contained

Delete GivenSelfContainedAppsRollForward. It doesn't work with 3.x+ already and won't work with 2.x MSRCs.
2019-12-16 14:03:10 -08:00
mmitche
d78a7565b5 Merge remote-tracking branch 'upstream/release/3.1.1xx' into merge-from-311xx 2019-12-10 13:52:12 -08:00
Matt Mitchell
9060c20d14
Merge pull request #5830 from dotnet-maestro-bot/merge/release/3.1.1xx-to-release/3.1.2xx
[automated] Merge branch 'release/3.1.1xx' => 'release/3.1.2xx'
2019-12-10 08:32:37 -08:00
Matt Mitchell
e382ec542b
Fixup indentation 2019-12-09 08:11:52 -08:00
Matt Mitchell
40a92b5d67
Fixup version patch 2019-12-09 08:11:28 -08:00
Matt Mitchell
2b6bd1474e Merge remote-tracking branch 'upstream/release/3.0.1xx' into merge-from-release/3.0.1xx 2019-12-09 08:07:02 -08:00
Divino César
624ec5e7b3 Augment DownloadFile task to make it able to download from public/private location (#5414)
* Patch to DownloadFile: retries + only use PrivateUri on 404 errors.

* Refactor PrivateURL in GenerateLayout.targets

* Address PR feedback.

* Addressing PR feedback.

* PR feedback

* PR feedback. Bug fix.

* Removing test related typo

* Fixup blob replacement

* Fixup blob replacement

* Broaden usage of read sas token to include PRs
2019-12-07 15:05:24 -08:00
William Godbe
a3c1db033e
Pin dependency on Core-Setup ref packs to 3.1.0 (#5814)
* Pin dependency on Core-Setup ref packs to 3.1.0

* Fixup core-setup feeds

* Move pinned deps later in file

* Update GenerateLayout to account for pinned packs
2019-12-06 14:56:33 -08:00
Nick Guerrera
41d020cd32 Merge branch 'master' into merge/release/3.1.2xx-to-master 2019-12-05 15:48:22 -08:00
William Li
5b489d6169
Update branching to "preview" 2019-12-05 11:14:53 -08:00
William Li
036e7afaff update branding 3.1.101 servicing 2019-11-22 13:29:45 -08:00
Matt Mitchell
7b0f60d871
[release/3.0.1xx] Update branding for 3.0.102 (#5725) 2019-11-22 11:25:16 -08:00
William Li
9018671d62
Set DropSuffix=false (#5737) 2019-11-21 11:22:15 -08:00
William Li
fc3c44a49c Update branding to 3.1.200 preview1 2019-11-21 10:23:59 -08:00
Nick Guerrera
4b50b4ac40 Bump 3.0 packs to 3.0.1 as appropriate (#5698) 2019-11-16 15:38:55 -08:00
William Godbe
9f6349b659
Update PreReleaseVersionLabel to RTM (#5671) 2019-11-15 12:50:53 -08:00
Daniel Plaisted
46cb5e7523 Stabilize package versions (#5587) 2019-11-13 11:49:49 -08:00
dotnet-maestro[bot]
a0c1b21f77 [release/3.1.1xx] Update dependencies from aspnet/AspNetCore (#5654)
* Update dependencies from https://github.com/aspnet/AspNetCore build 20191112.9

- VS.Redist.Common.AspNetCore.TargetingPack.x64.3.1 - 3.1.0-preview3.19562.9
- dotnet-user-secrets - 3.1.0-preview3.19562.9
- dotnet-watch - 3.1.0-preview3.19562.9
- Microsoft.AspNetCore.App.Ref - 3.1.0
- Microsoft.AspNetCore.App.Runtime.win-x64 - 3.1.0
- dotnet-dev-certs - 3.1.0-preview3.19562.9

* Fix typo
2019-11-13 08:38:15 -08:00
William Li
bfc1b10150 Merge branch 'release/3.0.1xx' into release/3.1.1xx-release/3.0.1xx-11-11-2019 2019-11-11 12:33:48 -08:00
William Li
b6eeb93ece Revert "Remove rhel.6"
This reverts commit 58537a3b9f9d2bf77e85a5db7f07da38c72ce14f.
2019-11-11 10:55:07 -08:00
Matt Mitchell
bc5f8df0f5
Download from blob storage (#5586)
Do not use the CDN as this can cause caching issues if bits have to be overwritten (which should not happen automatically, but may happen manually in certain cases)
2019-11-08 14:24:42 -08:00
Matt Mitchell
36f2678880 Update implicit package versions for 2.2.7 and 2.1.14 (#5566) 2019-11-08 08:29:33 -08:00
Omair Majid
17b5d95d8b Enable building on arm64 machines (#4102)
With this commit, I can build core-sdk on RHEL 8 on arm64 directly,
without cross compilation.

Bump the sourcelink version to pick up the ability to parse git info
without depending on libgit2sharp. This allows sourcelink to work on
arm64. The version is the same as the one recently added to core-setup:
https://github.com/dotnet/core-setup/pull/7696

Introduce a new 'BuildArchitecture' msbuild property that contains the host
architecture (arm64, x64, etc). This is the architecture of the
currently running machine, and may be different from the architecture we
are targetting in the case of cross compilation.

There's a gotcha with BuildArchitecture: under Visual Studio (an x86) process,
we generally want a x64 architecture. So try and restrict it to arm64 only.

Use BuildArchitecture to determine whether _crossDir and LibCLRJitRid need to
be special-cased for arm64 or or not.
2019-11-07 10:33:59 -06:00
Matt Mitchell
c8f7bac971 Merge remote-tracking branch 'origin/merge-from-301xx' into merge-from-301xx 2019-11-07 07:43:43 -08:00
Matt Mitchell
960aafbd94 Merge remote-tracking branch 'upstream/release/3.0.1xx' into merge-from-301xx 2019-11-07 07:34:41 -08:00
Matt Mitchell
ebecffa82f Merge remote-tracking branch 'upstream/release/3.0.1xx' into merge-from-301xx 2019-11-07 07:33:47 -08:00
Matt Mitchell
ec736cbd54
Update implicit package versions for 2.2.7 and 2.1.14 (#5566) 2019-11-07 07:05:11 -08:00
Matt Mitchell
a79f31732b
Stabilize package versions (#5540) 2019-11-04 22:41:51 -08:00
dotnet-maestro[bot]
8b9de75a22 [release/3.0.1xx] Update dependencies from aspnet/AspNetCore (#5526)
* Update dependencies from https://github.com/aspnet/AspNetCore build 20191104.2

- Microsoft.AspNetCore.App.Runtime.win-x64 - 3.0.1

* Fix blob URLs for stabilized ASP.NET 3.0.x

Unpin 3.0.x ASP.NET targeting pack

Revert dotnet-* tools packages to 3.0.0 versions

* Update dependencies from https://github.com/aspnet/AspNetCore build 20191104.7

- Microsoft.AspNetCore.App.Runtime.win-x64 - 3.0.1

* Fix version of the targeting pack

* Fix targeting pack version
2019-11-04 21:42:29 -08:00
Nick Guerrera
5f2669c394 Merge branch 'master' into merge/release/3.1.1xx-to-master 2019-11-04 15:38:12 -08:00
William Li
ced31b69bf Update dockers (#5186) (#5416)
- Remove ubuntu 14.04 and groovey file
- Remove all old fedora
- Update to Debian Stretch
- Remove rhel.6
	- No debian 9 1.x runtime support
2019-11-01 09:46:28 -07:00
Matt Mitchell
44a1686a40 Update branding for preview3 (#5443) 2019-10-31 17:11:55 -07:00
William Li
d660497f89
Update dockers (#5186)
- Remove ubuntu 14.04 and groovey file
- Remove all old fedora
- Update to Debian Stretch
- Remove rhel.6
	- No debian 9 1.x runtime support
2019-10-30 11:44:13 -07:00
halex2005
026695bb0c update nunit3 templates versions: (#5335)
- issued new v1.6.4 for .NET Core 3 with updated dependencies versions
- issued new v1.7.0 wih support for .NET Core 3.1 targeting, netcoreapp3.1 is the default targeting since that version
2019-10-30 11:03:30 -07:00
Nick Guerrera
4a0133f605
Merge pull request #5382 from dotnet/merges/release/3.0.1xx-to-release/3.1.1xx
Merge release/3.0.1xx to release/3.1.1xx
2019-10-29 12:56:35 -07:00
Livar
890dc4ba41
Update template versions for 2.1/2.2 to 2.1.14 and 2.2.8 (#5340)
* Update template versions for 2.1/2.2 to 2.1.14 and 2.2.8

* Update IDs of Microsoft.DotNet.Web.Spa.ProjectTemplates packages
2019-10-28 10:59:40 -07:00
Nick Guerrera
ed64463823 Merge branch 'release/3.1.1xx' into merges/release/3.0.1xx-to-release/3.1.1xx 2019-10-25 14:20:58 -07:00
Nick Guerrera
a655115e46
Download shared runtime archive from correct blob location (#5308) 2019-10-25 13:54:21 -07:00
Nick Guerrera
bfb734dbe0 Fix typos 2019-10-23 10:12:46 -07:00
Nick Guerrera
aa4c43735b Fix typos 2019-10-23 08:38:23 -07:00
Nick Guerrera
8e291f3189 Merge branch 'master' into merges/release/3.1.1xx-to-master 2019-10-23 08:26:09 -07:00
Nick Guerrera
b6ae1fbadc
Merge pull request #5263 from dotnet/merges/release/3.0.1xx-to-release/3.1.1xx
Merge release/3.0.1xx to release/3.1.1xx
2019-10-23 07:40:48 -07:00
John Beisner
cc47d12b0c
Increase button width (#5295) 2019-10-22 18:06:25 -07:00
John Beisner
62fbd18113
Updating the VS warning (#5294)
* Updating the VS warning; removing the upgrade GUIDs
2019-10-22 18:06:13 -07:00
Nick Guerrera
5d6a2e61ba Fix bundled versions 2019-10-22 13:41:25 -07:00
Nick Guerrera
05ad10ffba Fix build 2019-10-22 10:33:33 -07:00
Nick Guerrera
000f311b85 Fix merge issues 2019-10-18 17:12:15 -07:00
Nick Guerrera
1f88132cc4 Merge branch 'release/3.1.1xx' into merges/release/3.0.1xx-to-release/3.1.1xx 2019-10-18 16:19:05 -07:00
Nick Guerrera
8939b79a71 Add support for netcoreapp3.1, fix netcoreapp3.0, and fix tests 2019-10-18 14:48:44 -07:00
Nick Guerrera
4ea1958851 Merge branch 'master' into merges/release/3.1.1xx-to-master 2019-10-17 15:43:59 -07:00
Daniel Plaisted
c143f5e9b3 Update branding to 3.1.100-preview2 2019-10-14 11:42:24 -07:00
dotnet-maestro[bot]
dab2f0c140
[master] Update dependencies from dotnet/windowsdesktop (#5171)
* Update dependencies from https://github.com/dotnet/windowsdesktop build 20191008.4

- Microsoft.WindowsDesktop.App - 5.0.0-alpha1.19508.4

Dependency coherency updates

- Microsoft.Dotnet.WinForms.ProjectTemplates - 5.0.0-alpha1.19462.11 (parent: Microsoft.WindowsDesktop.App)
- Microsoft.DotNet.Wpf.ProjectTemplates - 5.0.0-alpha1.19462.16 (parent: Microsoft.WindowsDesktop.App)

* Update dependencies from https://github.com/dotnet/windowsdesktop build 20191008.5

- Microsoft.WindowsDesktop.App - 5.0.0-alpha1.19508.5

Dependency coherency updates

- Microsoft.Dotnet.WinForms.ProjectTemplates - 5.0.0-alpha1.19462.11 (parent: Microsoft.WindowsDesktop.App)
- Microsoft.DotNet.Wpf.ProjectTemplates - 5.0.0-alpha1.19462.16 (parent: Microsoft.WindowsDesktop.App)

* Use dotnet/windowsdesktop outputs
2019-10-08 17:50:59 +00:00
Nick Guerrera
0f52aed34c Prepare for 3.0.1xx servicing
We were bumping targeting pack, framework-dependent default
runtime version, and self-contained default (latest) runtime
version in unison. This only works for previews where these
versions are all the same always. Now that we're servicing 3.0,
we:

1. Pin targeting packs to 3.0.0
2. Fix default framework-dependent runtime version at 3.0.0

This change also:

* Removes dependencies on legacy/internal netcoreapp packages. We
  now use Microsoft.NETCore.App.Internal version exclusively to
  calculate the blob storage path for core-setup.

* Uses PackageDownload for all templates, including
  latest. PackageReference had been used for latest only because
  it hid another bug with the netcoreapp reference of
  redist.csproj that is fixed here. That reference is now a
  FrameworkReference as it should be.

* Removes a bunch of shenanigans from
  GenerateBundledVersions.props that were causing issues with
  above. One casualty of that is that we hard code the RID lists
  for runtime pack, which I don't think is too bad, and actually
  will make it easier to merge in source build patches.

* Cleans up how runtime and targeting pack versions are
  referenced throughout, removing incorrect assumptions about
  them being the same.

* Incorporates a prior closed PR to use suffixed version for blob
  storage, even when assets coming from blob storage are
  stabilized. It needed changes to merge with this.

Note:

* A similar theoretical servicing issue exists for the versions
  of apphost, hostfxr, shared host, which are still assumed to be
  the same as the runtime version in several places. If we choose
  to service those independently, more work is required.

* There will be a 3.0.1 ASP.NET targeting pack, and so we will
  have to unpin that once it is ready. This change establishes
  the baseline of all targeting packs being pinnned, and they can
  be unpinned in the (hopefully rare) cases where they need to be
  serviced.
2019-10-03 22:57:58 -07:00
John Beisner
1a7f735b3e
Enabling ASP.NET targeting pack and shared framework in RPM/DEB native installers. (#5090) 2019-10-03 14:37:59 -07:00
Nick Guerrera
7c72c6cb8d Fix typo causing 3.1 ASP.NET runtime pack to not be found 2019-10-02 12:42:28 -07:00
John Beisner
3623a38fb0
Merge branch 'release/3.1.1xx' into merges/release/3.0.1xx-to-release/3.1.1xx 2019-10-02 09:49:29 -07:00
Divino César
57c03e2caf Download blobs from MSRC storage & Add CredProvider to Dockerfiles (#4753)
* Download core-setup files from MSRC storage

Add support for downloading core-setup files from an authenticated endpoint

* Update GenerateLayout.targets

* Adding changes to pass SAS token around

* Add credential provider to Dockerfile's

* Update after PR feedback

* Add comments about approach

* Copy NuGet config variables
2019-10-01 13:22:33 -07:00
Nick Guerrera
0ef7c20be6 Fix missing download for Microsoft.DotNet.Web.ItemTemplates 3.0 2019-09-30 13:11:18 -07:00
Nick Guerrera
b06c620cf2 Fix merge errors 2019-09-30 12:34:02 -07:00
Nick Guerrera
9154996a8b Merge branch 'release/3.1.1xx' into merges/release/3.0.1xx-to-release/3.1.1xx 2019-09-30 11:38:51 -07:00
William Li
4c79da6f03
Remove opensuse (#4955) 2019-09-29 20:58:16 -07:00
Nick Guerrera
a4b4a7c9c5 Merge branch 'release/3.1.1xx' into merges/release/3.0.1xx-to-release/3.1.1xx 2019-09-26 15:33:25 -07:00
John Beisner
6d6273bc94
Sign the 3.1 Templates MSI (#4956) 2019-09-26 15:30:56 -07:00
Nick Guerrera
1ad1be909a Merge branch 'release/3.0.1xx' into merges/release/3.0.1xx-to-release/3.1.1xx 2019-09-26 15:12:34 -07:00
dotnet-maestro[bot]
61327a9bcb
[release/3.0.1xx] Update dependencies from dotnet/arcade (#4933)
* Update dependencies from https://github.com/dotnet/arcade build 20190924.3

- Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19474.3

* Update NuGet.config

* React to NuGet design change for PackageDownload with multiple versions

A single item must be used with semicolon-delimited versions.
2019-09-26 21:15:58 +00:00
William Li
59212cdc43
Remove opensuse (#4960) 2019-09-26 14:15:25 -07:00
John Beisner
156f17d882
Add 3.1 Templates MSIs (#4931)
* Adding 3.1 Templates MSI
2019-09-25 11:28:12 -07:00
Livar
ca0986c0ff
Updating branding to 3.0.1-servicing (#4924)
* Updating branding to 3.0.1-servicing

Also removed the DropSuffix so that we stop producing final branded builds for now.

* Address code review comments

Set DropSuffix to false instead of removing it.
2019-09-24 16:09:49 -07:00
Nick Guerrera
2ca44ceace Use stable 3.0.0/2.1.0 versions where appropriate 2019-09-24 12:48:28 -07:00
Nick Guerrera
ee070dc387 Fix typos in merge conflict resolution 2019-09-24 12:35:59 -07:00
Nick Guerrera
ceaa1c3a24 Merge branch 'release/3.1.1xx' into merges/release/3.0.1xx-to-release/3.1.1xx 2019-09-24 12:25:06 -07:00
John Beisner
76a361bbf8 Add CrossPlatform AppHost Packs; release/3.1.1xx (#4916)
* Add CrossPlatform AppHost Packs for arm & arm64.
2019-09-24 10:36:04 -07:00
Nick Guerrera
5c361b66bb Fix 3.1 tests 2019-09-20 16:21:57 -07:00
Nick Guerrera
a3bb220185 Add 3.1 templates 2019-09-20 16:21:57 -07:00
Nick Guerrera
0386ae221d React to msi rename 2019-09-20 16:21:57 -07:00
dotnet-maestro[bot]
5f6a012764 [release/3.0.1xx] Update dependencies from dotnet/toolset (#4886)
* Update dependencies from https://github.com/dotnet/toolset build 20190917.12

- Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc2.19467.12

Dependency coherency updates

- Microsoft.NET.Sdk - 3.0.100-rc2.19467.3 (parent: Microsoft.Dotnet.Toolset.Internal)

* Set to stable build
2019-09-18 00:20:16 -07:00
Matt Mitchell
88e6663236
Turn off stable builds (#4874) 2019-09-17 13:58:14 -07:00
dotnet-maestro[bot]
61dd7339c7
[master] Update dependencies from aspnet/AspNetCore (#4391)
* Update dependencies from https://github.com/aspnet/AspNetCore build 20190828.12

- Microsoft.AspNetCore.DeveloperCertificates.XPlat - 5.0.0-alpha1.19428.12
- Microsoft.AspNetCore.App.Runtime.win-x64 - 5.0.0-alpha1.19428.12
- Microsoft.AspNetCore.App.Ref - 5.0.0-alpha1.19428.12
- dotnet-watch - 5.0.0-alpha1.19428.12
- dotnet-user-secrets - 5.0.0-alpha1.19428.12
- dotnet-dev-certs - 5.0.0-alpha1.19428.12

* Update dependencies from https://github.com/aspnet/AspNetCore build 20190830.9

- Microsoft.AspNetCore.DeveloperCertificates.XPlat - 5.0.0-alpha1.19430.9
- Microsoft.AspNetCore.App.Runtime.win-x64 - 5.0.0-alpha1.19430.9
- Microsoft.AspNetCore.App.Ref - 5.0.0-alpha1.19430.9
- dotnet-watch - 5.0.0-alpha1.19430.9
- dotnet-user-secrets - 5.0.0-alpha1.19430.9
- dotnet-dev-certs - 5.0.0-alpha1.19430.9

* Update dependencies from https://github.com/aspnet/AspNetCore build 20190903.5

- Microsoft.AspNetCore.DeveloperCertificates.XPlat - 5.0.0-alpha1.19453.5
- Microsoft.AspNetCore.App.Runtime.win-x64 - 5.0.0-alpha1.19453.5
- Microsoft.AspNetCore.App.Ref - 5.0.0-alpha1.19453.5
- dotnet-watch - 5.0.0-alpha1.19453.5
- dotnet-user-secrets - 5.0.0-alpha1.19453.5
- dotnet-dev-certs - 5.0.0-alpha1.19453.5

* Update dependencies from https://github.com/aspnet/AspNetCore build 20190903.8

- Microsoft.AspNetCore.DeveloperCertificates.XPlat - 5.0.0-alpha1.19453.8
- Microsoft.AspNetCore.App.Runtime.win-x64 - 5.0.0-alpha1.19453.8
- Microsoft.AspNetCore.App.Ref - 5.0.0-alpha1.19453.8
- dotnet-watch - 5.0.0-alpha1.19453.8
- dotnet-user-secrets - 5.0.0-alpha1.19453.8
- dotnet-dev-certs - 5.0.0-alpha1.19453.8

* Update dependencies from https://github.com/aspnet/AspNetCore build 20190904.6

- Microsoft.AspNetCore.DeveloperCertificates.XPlat - 5.0.0-alpha1.19454.6
- Microsoft.AspNetCore.App.Runtime.win-x64 - 5.0.0-alpha1.19454.6
- Microsoft.AspNetCore.App.Ref - 5.0.0-alpha1.19454.6
- dotnet-watch - 5.0.0-alpha1.19454.6
- dotnet-user-secrets - 5.0.0-alpha1.19454.6
- dotnet-dev-certs - 5.0.0-alpha1.19454.6

* Update dependencies from https://github.com/aspnet/AspNetCore build 20190904.9

- Microsoft.AspNetCore.DeveloperCertificates.XPlat - 5.0.0-alpha1.19454.9
- Microsoft.AspNetCore.App.Runtime.win-x64 - 5.0.0-alpha1.19454.9
- Microsoft.AspNetCore.App.Ref - 5.0.0-alpha1.19454.9
- dotnet-watch - 5.0.0-alpha1.19454.9
- dotnet-user-secrets - 5.0.0-alpha1.19454.9
- dotnet-dev-certs - 5.0.0-alpha1.19454.9

* Update dependencies from https://github.com/aspnet/AspNetCore build 20190906.3

- Microsoft.AspNetCore.DeveloperCertificates.XPlat - 5.0.0-alpha1.19456.3
- Microsoft.AspNetCore.App.Runtime.win-x64 - 5.0.0-alpha1.19456.3
- Microsoft.AspNetCore.App.Ref - 5.0.0-alpha1.19456.3
- dotnet-watch - 5.0.0-alpha1.19456.3
- dotnet-user-secrets - 5.0.0-alpha1.19456.3
- dotnet-dev-certs - 5.0.0-alpha1.19456.3

* Update dependencies from https://github.com/aspnet/AspNetCore build 20190909.1

- Microsoft.AspNetCore.DeveloperCertificates.XPlat - 5.0.0-alpha1.19459.1
- Microsoft.AspNetCore.App.Runtime.win-x64 - 5.0.0-alpha1.19459.1
- Microsoft.AspNetCore.App.Ref - 5.0.0-alpha1.19459.1
- dotnet-watch - 5.0.0-alpha1.19459.1
- dotnet-user-secrets - 5.0.0-alpha1.19459.1
- dotnet-dev-certs - 5.0.0-alpha1.19459.1

* Update 3.0 versions to rc1, update TargetFramework for ASP.NET framework reference

* Update dependencies from https://github.com/aspnet/AspNetCore build 20190909.4

- Microsoft.AspNetCore.DeveloperCertificates.XPlat - 5.0.0-alpha1.19459.4
- Microsoft.AspNetCore.App.Runtime.win-x64 - 5.0.0-alpha1.19459.4
- Microsoft.AspNetCore.App.Ref - 5.0.0-alpha1.19459.4
- dotnet-watch - 5.0.0-alpha1.19459.4
- dotnet-user-secrets - 5.0.0-alpha1.19459.4
- dotnet-dev-certs - 5.0.0-alpha1.19459.4

* Update dependencies from https://github.com/aspnet/AspNetCore build 20190911.3

- Microsoft.AspNetCore.DeveloperCertificates.XPlat - 5.0.0-alpha1.19461.3
- Microsoft.AspNetCore.App.Runtime.win-x64 - 5.0.0-alpha1.19461.3
- Microsoft.AspNetCore.App.Ref - 5.0.0-alpha1.19461.3
- dotnet-watch - 5.0.0-alpha1.19461.3
- dotnet-user-secrets - 5.0.0-alpha1.19461.3
- dotnet-dev-certs - 5.0.0-alpha1.19461.3

* Update dependencies from https://github.com/aspnet/AspNetCore build 20190911.5

- Microsoft.AspNetCore.DeveloperCertificates.XPlat - 5.0.0-alpha1.19461.5
- Microsoft.AspNetCore.App.Runtime.win-x64 - 5.0.0-alpha1.19461.5
- Microsoft.AspNetCore.App.Ref - 5.0.0-alpha1.19461.5
- dotnet-watch - 5.0.0-alpha1.19461.5
- dotnet-user-secrets - 5.0.0-alpha1.19461.5
- dotnet-dev-certs - 5.0.0-alpha1.19461.5

* Update dependencies from https://github.com/aspnet/AspNetCore build 20190911.8

- Microsoft.AspNetCore.DeveloperCertificates.XPlat - 5.0.0-alpha1.19461.8
- Microsoft.AspNetCore.App.Runtime.win-x64 - 5.0.0-alpha1.19461.8
- Microsoft.AspNetCore.App.Ref - 5.0.0-alpha1.19461.8
- dotnet-watch - 5.0.0-alpha1.19461.8
- dotnet-user-secrets - 5.0.0-alpha1.19461.8
- dotnet-dev-certs - 5.0.0-alpha1.19461.8

* Update dependencies from https://github.com/aspnet/AspNetCore build 20190911.11

- Microsoft.AspNetCore.DeveloperCertificates.XPlat - 5.0.0-alpha1.19461.11
- Microsoft.AspNetCore.App.Runtime.win-x64 - 5.0.0-alpha1.19461.11
- Microsoft.AspNetCore.App.Ref - 5.0.0-alpha1.19461.11
- dotnet-watch - 5.0.0-alpha1.19461.11
- dotnet-user-secrets - 5.0.0-alpha1.19461.11
- dotnet-dev-certs - 5.0.0-alpha1.19461.11

* Update dependencies from https://github.com/aspnet/AspNetCore build 20190911.13

- Microsoft.AspNetCore.DeveloperCertificates.XPlat - 5.0.0-alpha1.19461.13
- Microsoft.AspNetCore.App.Runtime.win-x64 - 5.0.0-alpha1.19461.13
- Microsoft.AspNetCore.App.Ref - 5.0.0-alpha1.19461.13
- dotnet-watch - 5.0.0-alpha1.19461.13
- dotnet-user-secrets - 5.0.0-alpha1.19461.13
- dotnet-dev-certs - 5.0.0-alpha1.19461.13

* Update dependencies from https://github.com/aspnet/AspNetCore build 20190912.1

- Microsoft.AspNetCore.DeveloperCertificates.XPlat - 5.0.0-alpha1.19462.1
- Microsoft.AspNetCore.App.Runtime.win-x64 - 5.0.0-alpha1.19462.1
- Microsoft.AspNetCore.App.Ref - 5.0.0-alpha1.19462.1
- dotnet-watch - 5.0.0-alpha1.19462.1
- dotnet-user-secrets - 5.0.0-alpha1.19462.1
- dotnet-dev-certs - 5.0.0-alpha1.19462.1

* Update dependencies from https://github.com/aspnet/AspNetCore build 20190912.5

- Microsoft.AspNetCore.DeveloperCertificates.XPlat - 5.0.0-alpha1.19462.5
- Microsoft.AspNetCore.App.Runtime.win-x64 - 5.0.0-alpha1.19462.5
- Microsoft.AspNetCore.App.Ref - 5.0.0-alpha1.19462.5
- dotnet-watch - 5.0.0-alpha1.19462.5
- dotnet-user-secrets - 5.0.0-alpha1.19462.5
- dotnet-dev-certs - 5.0.0-alpha1.19462.5

* Update dependencies from https://github.com/aspnet/AspNetCore build 20190912.9

- Microsoft.AspNetCore.DeveloperCertificates.XPlat - 5.0.0-alpha1.19462.9
- Microsoft.AspNetCore.App.Runtime.win-x64 - 5.0.0-alpha1.19462.9
- Microsoft.AspNetCore.App.Ref - 5.0.0-alpha1.19462.9
- dotnet-watch - 5.0.0-alpha1.19462.9
- dotnet-user-secrets - 5.0.0-alpha1.19462.9
- dotnet-dev-certs - 5.0.0-alpha1.19462.9

* Update dependencies from https://github.com/aspnet/AspNetCore build 20190916.1

- Microsoft.AspNetCore.DeveloperCertificates.XPlat - 5.0.0-alpha1.19466.1
- Microsoft.AspNetCore.App.Runtime.win-x64 - 5.0.0-alpha1.19466.1
- Microsoft.AspNetCore.App.Ref - 5.0.0-alpha1.19466.1
- dotnet-watch - 5.0.0-alpha1.19466.1
- dotnet-user-secrets - 5.0.0-alpha1.19466.1
- dotnet-dev-certs - 5.0.0-alpha1.19466.1

* Update dependencies from https://github.com/aspnet/AspNetCore build 20190916.2

- Microsoft.AspNetCore.DeveloperCertificates.XPlat - 5.0.0-alpha1.19466.2
- Microsoft.AspNetCore.App.Runtime.win-x64 - 5.0.0-alpha1.19466.2
- Microsoft.AspNetCore.App.Ref - 5.0.0-alpha1.19466.2
- dotnet-watch - 5.0.0-alpha1.19466.2
- dotnet-user-secrets - 5.0.0-alpha1.19466.2
- dotnet-dev-certs - 5.0.0-alpha1.19466.2

* Update dependencies from https://github.com/aspnet/AspNetCore build 20190916.4

- Microsoft.AspNetCore.DeveloperCertificates.XPlat - 5.0.0-alpha1.19466.4
- Microsoft.AspNetCore.App.Runtime.win-x64 - 5.0.0-alpha1.19466.4
- Microsoft.AspNetCore.App.Ref - 5.0.0-alpha1.19466.4
- dotnet-watch - 5.0.0-alpha1.19466.4
- dotnet-user-secrets - 5.0.0-alpha1.19466.4
- dotnet-dev-certs - 5.0.0-alpha1.19466.4

* Update dependencies from https://github.com/aspnet/AspNetCore build 20190916.5

- Microsoft.AspNetCore.DeveloperCertificates.XPlat - 5.0.0-alpha1.19466.5
- Microsoft.AspNetCore.App.Runtime.win-x64 - 5.0.0-alpha1.19466.5
- Microsoft.AspNetCore.App.Ref - 5.0.0-alpha1.19466.5
- dotnet-watch - 5.0.0-alpha1.19466.5
- dotnet-user-secrets - 5.0.0-alpha1.19466.5
- dotnet-dev-certs - 5.0.0-alpha1.19466.5

* Update dependencies from https://github.com/aspnet/AspNetCore build 20190916.7

- Microsoft.AspNetCore.DeveloperCertificates.XPlat - 5.0.0-alpha1.19466.7
- Microsoft.AspNetCore.App.Runtime.win-x64 - 5.0.0-alpha1.19466.7
- Microsoft.AspNetCore.App.Ref - 5.0.0-alpha1.19466.7
- dotnet-watch - 5.0.0-alpha1.19466.7
- dotnet-user-secrets - 5.0.0-alpha1.19466.7
- dotnet-dev-certs - 5.0.0-alpha1.19466.7

* Support targeting ASP.NET Core 5.0
2019-09-17 20:09:37 +00:00
Matt Mitchell
63f7b6f811
[release/3.0.1xx] Fix resource branding (#4859)
* Fix resource branding
The resource branding for MicrosoftNETCoreApp and the Windows desktop runtime does not come from the same properties any longer.  Use appropriate properties instead.

* Fix Linux native installer branding
2019-09-16 10:49:46 -07:00
Matt Mitchell
88949b55f5
Fix "you are using a preview version" message (#4860)
The property in the bundled version props file installed with the SDK is _NETCoreSdkIsPreview. We use the same property name to define this value when creating the props file. We build with a preview version of the SDK. Because this is set by the preview SDK, and already has a value, we will not reset it when DropSuffix=true. It will simply remain 'true'. Thus we will simply propagate that existing value into the new props file.  To fix, change the property name.
2019-09-16 10:47:04 -07:00
Matt Mitchell
2834b77278
Stabilize package versions (#4833) 2019-09-15 17:41:50 -07:00
dotnet-maestro[bot]
b6037e6820 [release/3.0.1xx] Update dependencies from aspnet/AspNetCore (#4851)
* Update dependencies from https://github.com/aspnet/AspNetCore build 20190915.2

- dotnet-user-secrets - 3.0.0-rc2.19465.2
- dotnet-watch - 3.0.0-rc2.19465.2
- Microsoft.AspNetCore.App.Ref - 3.0.0
- Microsoft.AspNetCore.App.Runtime.win-x64 - 3.0.0
- dotnet-dev-certs - 3.0.0-rc2.19465.2
- Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.0.0-rc2.19465.2

* Correctly identify aspnetcore blob subdir
2019-09-15 17:27:29 -07:00
dotnet-maestro[bot]
5c5cd9667f [release/3.0.1xx] Update dependencies from dotnet/core-setup (#4815)
* Update dependencies from https://github.com/dotnet/core-setup build 20190913.05

- Microsoft.NETCore.App - 3.0.0-rc2-19463-05
- NETStandard.Library.Ref - 2.1.0
- Microsoft.WindowsDesktop.App - 3.0.0-rc2-19463-05

Dependency coherency updates

- Microsoft.Dotnet.WinForms.ProjectTemplates - 4.8.0-rc2.19462.10 (parent: Microsoft.WindowsDesktop.App)
- Microsoft.DotNet.Wpf.ProjectTemplates - 3.0.0 (parent: Microsoft.WindowsDesktop.App)

* Add a dependency on Microsoft.NETCore.Platforms
This is not directly depended upon, but causes Maestro to flow stable feed locations.

* Use runtime package version

* Fix installer download locations

* Update windows desktop installer location

* Explicit reference the host model

* Make ref package version explicit

* Update property used to identify host version

* Update apphost versions

* Updated property versions to be used for branding, crossgen and bundled versions generation.
2019-09-13 18:36:11 -07:00
jbeisner
0e0ab3e6f3 Add an icon to the SDKPlaceHolder MSI 2019-09-11 17:14:57 -07:00
Chris Rummel
db6496271c Don't overwrite AspNetCoreSharedFxInstallerRid if it's already set. (#4734) 2019-09-11 15:45:08 -07:00
Livar
0714086bdf
Fixing the channel for the master branch. 2019-09-11 14:48:13 -07:00
John Beisner
9d2ba908f0
Merge pull request #4638 from imba-tjd/patch-1
LOC update for zh-cn and zh-tw
2019-09-11 12:49:51 -07:00
Livar Cunha
0fa63a5fef Re-doing the merge of GenerateBundledVersion.targets. 2019-09-11 10:33:24 -07:00
Livar Cunha
5421af4ad6 Merge remote-tracking branch 'upstream/release/3.1.1xx' into merges/release/3.1.1xx-to-master
* upstream/release/3.1.1xx: (422 commits)
  Update dependencies from https://github.com/dotnet/toolset build 20190911.12 (#4733)
  Update dependencies from https://github.com/dotnet/toolset build 20190911.11 (#4731)
  Update dependencies from https://github.com/aspnet/AspNetCore build 20190911.1 (#4729)
  [release/3.1.1xx] Update dependencies from dotnet/toolset (#4211)
  Update dependencies from https://github.com/dotnet/arcade build 20190910.3 (#4728)
  Exclude ASP.NET targeting pack and shared framework from RPM/debs until we have 3.1 versions
  Add support for targeting .NET Core 3.1
  Update latest patch versions
  Update dependencies from https://github.com/dotnet/arcade build 20190909.10 (#4716)
  Do not download for 'arm*'
  Formatting...
  Download the ASP.NET SharedFramework MSI and the Module V2 MSI
  Update dependencies from https://github.com/dotnet/arcade build 20190908.2 (#4695)
  Update dependencies from https://github.com/dotnet/core-setup build 20190908.7
  Add release/3.1.xx download to readme (#4618)
  Update dependencies from https://github.com/dotnet/core-setup build 20190908.3
  Update dependencies from https://github.com/dotnet/arcade build 20190907.1 (#4667)
  Update dependencies from https://github.com/dotnet/core-setup build 20190907.10
  Update dependencies from https://github.com/dotnet/arcade build 20190906.10 (#4643)
  Update dependencies from https://github.com/dotnet/core-setup build 20190907.3
  ...

Conflicts:
README.md
eng/Version.Details.xml
eng/Versions.props
eng/common/native/install-cmake-test.sh
global.json
src/redist/targets/GenerateBundledVersions.targets
src/redist/targets/Versions.targets
2019-09-11 10:09:32 -07:00
Daniel Plaisted
82c5e8502c
Merge pull request #4600 from dotnet/merges/release/3.0.100-preview9-to-release/3.0.1xx
Merge release/3.0.100-preview9 to release/3.0.1xx
2019-09-10 17:13:37 -07:00
Daniel Plaisted
ce3db2423f
Merge pull request #4721 from dsplaisted/support-3.1
Support targeting .NET Core 3.1
2019-09-10 16:04:06 -07:00
Daniel Plaisted
61d7005440 Exclude ASP.NET targeting pack and shared framework from RPM/debs until we have 3.1 versions 2019-09-10 15:03:12 -07:00
Daniel Plaisted
9931222c67 Update latest patch versions 2019-09-10 14:06:57 -07:00
Daniel Plaisted
827464d908 Add support for targeting .NET Core 3.1 2019-09-10 13:58:14 -07:00
Daniel Plaisted
724015cc60 Update latest patch versions 2019-09-10 13:53:43 -07:00
Livar
527312b4af
Fixing channel 2019-09-10 13:37:30 -07:00
jbeisner
b9ade4c05c Do not download for 'arm*' 2019-09-09 12:51:24 -07:00
jbeisner
cbafd9b1f4 Formatting... 2019-09-09 12:43:04 -07:00
jbeisner
01566ce154 Download the ASP.NET SharedFramework MSI and the Module V2 MSI 2019-09-09 12:38:32 -07:00
谭九鼎
5358c34cb7
Revert "Runtime" translation 2019-09-07 18:16:44 +08:00
谭九鼎
df3e5a9908
Update statement, add spaces, fix typo 2019-09-07 18:14:38 +08:00
Livar
8eedfce749
Updating branding to rc2 2019-09-05 12:41:56 -07:00
Livar Cunha
f0d988effa Fix the branch info information to use release/3.0.100-preview9. 2019-09-05 12:35:44 -07:00
Daniel Ye
8947097610 Localization update for PTB term changes. 2019-09-04 14:15:56 -07:00
jbeisner
0c67172baf Updates for 3.1.1xx 2019-09-03 14:33:11 -07:00
Matt Mitchell
6ef4a17f0e
Fix branch info in release/3.0.1xx branch
Channel was changed incorrectly in https://github.com/dotnet/core-sdk/pull/4182/files
2019-08-27 13:06:39 -07:00
Livar
2243a75129
Merge branch 'release/3.0.1xx' into merges/release/3.0.100-preview9-to-release/3.0.1xx 2019-08-27 10:43:09 -07:00
jbeisner
acd7d01676 Add height to the 'FailureRestartText' 2019-08-26 15:39:30 -07:00
William Li
f1c62d315e Correct branding 2019-08-23 13:41:03 -07:00
Matt Mitchell
7532bd3f62
Fix p9 branch channel. (#4179) 2019-08-22 15:58:51 -07:00
William Li
032926e8fc 3.1.1xx branding 2019-08-21 18:51:43 -07:00
Livar
b830442d62
Updating release/3.0.1xx branding to rc1. 2019-08-20 14:07:50 -07:00
John Beisner
fd4ebe6d48
Merge pull request #4069 from johnbeisner/VS-ARP-PlaceHolder
SDK ARP Placeholder for Visual Studio
2019-08-19 17:23:34 -07:00
jbeisner
daee0c40db Updates per code review. 2019-08-19 11:15:40 -07:00
jbeisner
c3ae4a64a8 Updates per code review. 2019-08-16 21:54:47 +00:00
jbeisner
9fe66e5c0f Adding 'ARPNOREPAIR' 2019-08-16 19:24:07 +00:00
jbeisner
e367a32ce4 Introducing a SDK ARP Placeholder for Visual Studio 2019-08-16 18:56:20 +00:00
Zbyněk Sailer
3c07d89244 LOC CHECKIN | dotnet/core-sdk master | 20190813 (#3982) 2019-08-15 10:17:08 -07:00
jbeisner
2d53cf29ec Removing the RelativeLayoutPath: "shared" for the WinForms and Wpf ArchiveFile 2019-08-09 12:10:43 -07:00
jbeisner
f797953741 Removing the RelativeLayoutPath: "shared" for the WinForms and Wpf ArchiveFile 2019-08-09 12:10:40 -07:00
Nick Guerrera
c37db568fe
Remove unused variables from bundled versions (#3742)
These are replaced by the ImplicitPackageReferenceVersion items, and were mostly removed from 2.x:  

4158f5e94f
2019-08-09 09:09:39 -07:00
jbeisner
c820b75ae8 Fixing a typo... 2019-08-08 12:37:16 -07:00
jbeisner
562adf13ea Updating the .NET Core installer welcome message. 2019-08-08 08:50:50 -07:00
Nick Guerrera
aca24e4ecb Fix RHEL test failure 2019-08-07 13:02:21 -07:00
jbeisner
a489af6341 Updating link; "Core" change to ".NET Core" 2019-08-06 09:12:39 -07:00
Nick Guerrera
81100b05d2 Use *.5.0 template packages 2019-08-05 15:12:49 -07:00
Nick Guerrera
ac2000cc03 Add netcoreapp5.0 support to bundled versions
* Use 3.0-preview7 when targeting netcoreapp3.0 with 5.0 SDK for now
* Update known app host packs and framework references to 5.0
* Remove workaround for fixed bug from tests
* Temporarily expect run failure while templates are still at 3.0
2019-08-02 22:19:00 -07:00
John Beisner
15fcfc5c6f
Merge pull request #3624 from johnbeisner/TemplateNupkgVersioning
Standardize 2.1/2.2/3.0 templates NuPkg version
2019-07-31 08:06:19 -07:00
Daniel Plaisted
c5a57d5805
Merge pull request #3576 from dsplaisted/crossgen-sdktasks
Fix crossgen for SDK tasks and native image symbol publishing
2019-07-30 18:09:46 -07:00
jbeisner
648c78a01e Use the SDK version as the NuPkg version for templates; remove superfluous WiX logic in the templates' MSI 2019-07-30 21:50:31 +00:00
Daniel Plaisted
446a3dc389 Change directory for native PDBs, so arcade should pick them up for publishing 2019-07-29 18:14:22 -07:00
Daniel Plaisted
3435d946ed Fix crossgen'ing .NET SDK build tasks 2019-07-29 18:13:54 -07:00
Livar
21de391bc1
Updating branding to preview9 2019-07-29 10:33:54 -07:00
Livar
67910f5e07
Updating branding to 5.0.100-alpha1 2019-07-28 12:06:50 -07:00
Livar Cunha
a138255f58 Keep the latest channel as release/3.0.1xx. 2019-07-28 12:04:40 -07:00
Livar Cunha
4083b9eda1 Updating GenerateMSBuildExtensionsSWR to match what we actually insert into VS. 2019-07-26 10:38:38 -07:00
John Beisner
a3af2c43a5
Merge pull request #3383 from johnbeisner/TemplatesUpdate
Adding 2.1 and 2.2 Templates MSIs
2019-07-24 13:49:56 -07:00
Nick Guerrera
d1f57e32ce
Don't include WindowsDesktop targeting pack in x-plat tarball (#3403) 2019-07-24 11:02:42 -07:00
jbeisner
75e5139fe1 Merging master and resolving conflicts. 2019-07-24 16:14:47 +00:00
jbeisner
67c7c446f9 Updates per code review 2019-07-24 16:08:11 +00:00
jbeisner
249af0f120 Updates per code review. 2019-07-24 03:32:47 +00:00
Daniel Plaisted
5a590771e5
Merge pull request #2970 from dsplaisted/remove-legacyframeworkpackages
Remove PackagesToReference metadata from Microsoft.NETCore.App KnownFrameworkReference
2019-07-23 18:58:27 -07:00
jbeisner
b95848906a Fixing the 3.0 template conditional; adding a comment. 2019-07-24 00:41:46 +00:00
jbeisner
aacd4f6179 Updating 3.0 template variables. 2019-07-24 00:18:21 +00:00
jbeisner
14ef11f030 Formatting... 2019-07-22 22:31:48 +00:00
jbeisner
f31451cbc0 Minor updates to variable names 2019-07-22 22:26:51 +00:00
jbeisner
f55ddb8a15 Adding 2.1 and 2.2 Templates MSIs, part 3 2019-07-22 17:06:16 +00:00
jbeisner
4de1b875e5 Adding 2.1 and 2.2 Templates MSIs, part 2 2019-07-22 15:55:23 +00:00
jbeisner
49ad1e8dd5 Adding 2.1 and 2.2 Templates MSIs, part 1 2019-07-17 23:18:41 +00:00
John Beisner
a5630932ee
Merge pull request #3201 from johnbeisner/TemplateMSIs
Generate a MSI for templates and move templates to dotnet/Templates
2019-07-17 08:28:28 -07:00
Livar Cunha
34a888c02f Fixing the condition for when we do a build without a suffix (final branding). 2019-07-15 17:22:56 -07:00
Livar Cunha
5475a81a55 Switch to lower case t (templates) for the folder name under dotnet. 2019-07-15 10:25:17 -07:00
Livar Cunha
c35bcd49af Adding new templates folder to pkg native installer.
Moved templates folder under dotnet to Templates (capital T) and added dotnet/Templates to the deb installer.

Adding Templates to the sdk rpm native installer.
2019-07-14 22:21:30 -07:00
Livar Cunha
3247485b57 Re-enable the generation of the msbuildextensions nupkg. 2019-07-12 15:05:32 -07:00
jbeisner
e2eb862efb Creating a Windows MSI for templates. 2019-07-11 00:43:29 +00:00
Livar
192b7945f0
Update implicit versions for self-contained apps for 2.1 and 2.2 2019-07-09 14:51:56 -07:00
Daniel Plaisted
fec1bb4f16 Remove PackagesToReference metadata from Microsoft.NETCore.App KnownFrameworkReference 2019-07-08 16:00:33 -07:00
dotnet-maestro[bot]
eccec24551
[master] Update dependencies from aspnet/AspNetCore (#2811)
* Update dependencies from https://github.com/aspnet/AspNetCore build 20190708.2

- Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.0.0-preview8.19358.2
- Microsoft.AspNetCore.App.Runtime.win-x64 - 3.0.0-preview8.19358.2
- Microsoft.AspNetCore.App.Ref - 3.0.0-preview8.19358.2
- dotnet-watch - 3.0.0-preview8.19358.2
- dotnet-user-secrets - 3.0.0-preview8.19358.2
- dotnet-dev-certs - 3.0.0-preview8.19358.2

* React to SPA template rename
2019-07-08 18:20:32 +00:00
jbeisner
9ec2da3408 Branding update to "preview8" 2019-07-02 00:13:44 +00:00
dotnet-maestro[bot]
76797cc920
[master] Update dependencies from dotnet/arcade (#2667)
* Update dependencies from https://github.com/dotnet/arcade build 20190626.44

- Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19326.44

* Add missing feed

* Use PackageDownload

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

- Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19327.39

* Use new apphost package and stop downloading extra packages
2019-06-28 13:15:43 +00:00
Chris Rummel
6962cd30c5 Allow specifying CoreSetupRid. 2019-06-25 12:08:51 -07:00
Chris Rummel
64ba96eac4 Don't copy over packages if there are no packages to copy. 2019-06-25 12:08:26 -07:00
Chris Rummel
194cdca506 Don't reset blob URL if we pass it in. 2019-06-25 12:08:11 -07:00
Dan Seefeldt
453414fc75 Consolidate MSBuild* versions for source-build (#2554) 2019-06-20 15:24:02 -07:00
Livar
5d80f38dba
Merge pull request #2005 from dotnet/darc-master-33a78994-1ff6-4b93-90fb-cbd9502e5547
[master] Update dependencies from dotnet/arcade
2019-06-18 16:52:59 -07:00
Parallels
eb29f40037 Fixing the property we use in the DotnetDebTool to get the path to a stage0 dotnet. 2019-06-18 16:38:26 -07:00
John Beisner
945767a2a2
Addressing VS signing errors. (#2500) 2019-06-18 06:49:09 -07:00
Nate McMaster
c3eb847334
Add linux-musl-arm64 to list of supported AspNetCore runtimes (#2441) 2019-06-12 13:42:09 -07:00
John Beisner
4c3683314b
Rename: "VS.Redist.Common.Net.Core.Toolset" -> "VS.Redist.Common.NetCore.Toolset" (#2403) 2019-06-11 13:16:26 -07:00
Daniel Plaisted
5293e96d5a
Merge pull request #2401 from dsplaisted/update-runtime-packs
Update runtime pack names
2019-06-10 17:57:09 -07:00
Daniel Plaisted
da3a92ae63 Remove unused apphost metadata from KnownFrameworkReference 2019-06-10 17:29:39 -07:00
John Beisner
1e7815b2dd
Produce Toolset MSI NuPkgs for insertion into VS (#2359)
* Produce Toolset MSI NuPkgs for insertion into VS; stop producing SDK bundle NuPkgs.
2019-06-10 16:00:53 -07:00
Daniel Plaisted
8aff01947a Update runtime pack names 2019-06-10 15:32:28 -07:00
Daniel Plaisted
202d9f2daa
Merge pull request #2279 from dsplaisted/add-ui-knownframeworks
Add KnownFrameworkReference items for WPF and WindowsForms profiles
2019-06-05 11:40:21 -07:00
Nick Guerrera
92d69e6885
Exclude sdk resolver layout from source build (#2232) 2019-06-04 13:05:25 -07:00
Daniel Plaisted
e5275d990f Add KnownFrameworkReference items for WPF and WindowsForms profiles 2019-06-03 19:01:54 -07:00
William Li
7cbec05bd5 correct branch info on master (#2253) 2019-06-03 17:30:28 -07:00
William Li
b47d352a48 Update branding to preview 7 2019-06-02 19:35:45 -07:00
William Li
f4215da1b7 Merge remote-tracking branch 'origin/release/3.0.1xx' into merges/release/3.0.1xx-to-master 2019-06-02 10:52:22 -07:00
Peter Huene
565e0d9b06
Update Microsoft.WindowsDesktop.App to mark as "Windows only".
This commit marks the `Microsoft.WindowsDesktop.App` known framework reference
as Windows only.  This will be used by a upcoming SDK change to ensure that
"Windows only" frameworks can only be used on Windows.
2019-05-30 17:35:20 -07:00
Nate McMaster
a0107cdb1d
Remove workaround for aspnet/AspNetCore#8835 (#2170)
* Remove workaround for aspnet/AspNetCore#8835

* Update GenerateLayout.targets

* Update ASP.NET Core to 3.0.0-preview6-19279-08
2019-05-30 10:48:46 -07:00
Peter Huene
33815f75c9
Remove Windows Desktop project templates for non-Windows.
This commit removes the Windows Desktop project templates for non-Windows
builds of the .NET Core SDK.

Fixes dotnet/cli#11425.
2019-05-29 19:06:11 -07:00
John Beisner
6392d02bf3
Updating some translations... (#2194) 2019-05-29 11:56:22 -07:00
John Beisner
808359df16
Increasing the SDK bundle installer button size 20-px (#2123)
* Increasing the SDK bundle installer button size 20-px
2019-05-24 15:24:24 -07:00
John Beisner
f55dd40436
Omit nupkgs and related files in the SDK bundle. (#2030) 2019-05-16 16:33:49 -07:00
John Beisner
d987a525c8
Resolve named CAB collision and drop the CABs (#1976)
* Resolve named CAB collision; drop the CABs.

* Resolving naming convention warning: 8 chars plus {0} are allowed.

* Update src/redist/targets/packaging/windows/clisdk/dotnet.wxs

Co-Authored-By: Peter Huene <pehuene@microsoft.com>
2019-05-16 16:33:29 -07:00
John Beisner
8ae3afa572
Updating projectUrl values from "cli" to "core-sdk" (#1800) 2019-05-16 16:32:26 -07:00
Nate McMaster
d30a9f5c83
Remove dotnet-sql-cache from the CLI (#2014) 2019-05-16 07:49:25 -07:00
Daniel Plaisted
865f1c2745
Merge pull request #1992 from sbomer/isTrimmable
Mark Microsoft.NETCore.App as trimmable
2019-05-15 16:31:10 -07:00
Sven Boemer
39212e1699 Define NetCoreRoot (#1997)
This will be used by the SDK to locate the dotnet host when running in
desktop msbuild. Necessary for tools that always run on .NET Core,
like the IL Linker.
2019-05-15 14:24:56 -07:00
John Beisner
b0f2205264
Adding localization to the Windows SDK bundle installers (#1996)
* Adding localization to the Windows SDK bundle installers
2019-05-15 12:51:44 -07:00
Livar Cunha
6e33b6e3de Fix implicit versions for self-contained apps. Updated versions to 1.0.16, 1.1.13, 2.1.11 and 2.2.5. 2019-05-14 11:23:04 -07:00
Sven Boemer
8c81543eb5 Mark Microsoft.NETCore.App as trimmable
The SDK will be updated to flow this metadata to resolved dlls,
influencing the default linker behavior.
2019-05-14 08:45:50 -07:00
Daniel Plaisted
75702b2d6e
Merge pull request #1839 from dagood/fix-core-setup-download
Fix core-setup update: download consolidated dotnet-runtime-deps Deb pkg
2019-05-03 16:03:57 -07:00
Davis Goodin
3985d797c8 Download consolidated dotnet-runtime-deps Deb pkg 2019-05-03 17:18:14 -05:00
Ricardo Arenas
1c52fe86a7 make publish of internal asset conditional (#1832) 2019-05-02 10:50:02 -07:00
Daniel Plaisted
8bcd7ee623 Add PackagesToReference metadata to KnownFrameworkReference
The SDK will consume this to generate PackageReferences to "empty" packages such as Microsoft.NETCore.App
2019-04-26 08:47:25 -07:00
Daniel Plaisted
44f0335886
Merge pull request #1765 from dsplaisted/remove-runtimepack-internal
Don't use .Internal suffix for runtime packs
2019-04-26 08:30:45 -07:00
Daniel Plaisted
de6f99b7ad Don't use .Internal suffix for runtime packs
This was removed with https://github.com/dotnet/core-setup/pull/6096
2019-04-26 08:14:05 -07:00
John Beisner
fe905c81da
SDK bundle UI modifications (#1756)
* SDK bundle UI modifications.
2019-04-26 08:06:14 -07:00
Daniel Plaisted
f21fc9c2ba
Merge pull request #1748 from dsplaisted/use-internal-netcoreapp-package
Switch to  .Internal insertion package for .NET Core
2019-04-25 11:18:30 -07:00
Daniel Plaisted
27be26f712 Switch to .Internal insertion package for .NET Core 2019-04-25 08:51:39 -07:00
John Beisner
ca9216c97d
[WIP] Removal of additional package feeds set by default (#1561)
Removal of additional package feeds set by default
2019-04-23 10:33:16 -07:00
William Li
12b159311d Update branding to preview 6 2019-04-21 18:15:11 -07:00
William Li
d734147745 Revert src/CopyToLatest/targets/BranchInfo.props change 2019-04-21 17:40:05 -07:00
Daniel Plaisted
3289119b23 Update apphost pack pattern 2019-04-19 10:54:35 -07:00
John Beisner
07b074acf7
adding .Net core AppHost pack (#1519)
* adding .Net core AppHost pack
2019-04-17 12:53:05 -07:00
Daniel Plaisted
9f998eabcd Switch to .Ref targeting pack for .NET Standard 2.1 2019-04-15 19:04:36 -07:00
dotnet-maestro[bot]
16daae1035
[master] Update dependencies from dotnet/core-setup (#1447)
* Update dependencies from https://github.com/dotnet/core-setup build 20190412.04

- Microsoft.NETCore.App - 3.0.0-preview5-27612-04
- Microsoft.WindowsDesktop.App - 3.0.0-preview5-27612-04
- NETStandard.Library.Ref - 2.1.0-preview5-27612-04

* Update dependencies from https://github.com/dotnet/core-setup build 20190412.06

- Microsoft.NETCore.App - 3.0.0-preview5-27612-06
- Microsoft.WindowsDesktop.App - 3.0.0-preview5-27612-06
- NETStandard.Library.Ref - 2.1.0-preview5-27612-06

* Updating 'windowsdesktop-runtime' asset names and blob paths.

* Updating the blob root...

* Updating the RID for 'windowsdesktop-runtime' archive.
2019-04-12 20:15:30 +00:00
John Beisner
0d4bdcd199
adding .Net standard 2.1 Targeting Packs (#1309)
* adding .Net standard 2.1 Targeting Packs
2019-04-10 08:55:46 -07:00
Nick Guerrera
28e5c54dfe Merge branch 'master' into merges/release/3.0.1xx-to-master 2019-04-09 11:13:55 -07:00
Nick Guerrera
5c96d57220
[release/3.01xx] Bump latest 2.1/2.2 in bundled versions (#1307) 2019-04-09 11:06:05 -07:00
William Li
1f8839eb4a Revert <Channel>release/3.0.1xx</Channel> back 2019-04-08 11:00:59 -07:00
William Li
afb5778559 Update branding to preview5 2019-04-07 16:35:28 -07:00
William Li
219089e762
Merge pull request #1133 from nguerrera/remove-azure-dependency-from-source-build
Remove dependency on WindowsAzure.Storage in source build
2019-04-04 16:28:13 -07:00
William Li
6400435101
Merge pull request #1121 from bricelam/ef-no
Remove dotnet-ef
2019-04-04 11:00:46 -07:00
John Beisner
4f57f8e679
Adding the NetCoreApp and ASP.Net Targeting Packs to the native MacOS installer (#1173)
Adding the NetCoreApp and ASP.Net Targeting Packs to the native MacOS installer - PKG
* Add the ASP.Net Targeting Pack from an archive.
2019-04-02 15:51:47 -07:00
Brice Lambson
331c153709
Remove dotnet-ef
Resolves aspnet/EntityFrameworkCore#14016
2019-04-02 15:03:32 -07:00
John Beisner
7289df22ae
Update release notes link; MacOS (#1181)
Update release notes link; MacOS
2019-04-02 13:12:17 -07:00
John Beisner
10224a8d3b
Linux native installer updates: DEB and RPM (#1122)
Adding targeting packs to native Linux installers.
 * Re-enable RPM and DEB installation testing.
2019-04-01 14:24:56 -07:00
Nick Guerrera
f688dc6920 Remove dependency on WindowsAzure.Storage in source build
The source code had already been conditioned out, but the conditional
PackageReference and DefineConstants got lost when this code moved to
core-sdk
2019-03-27 12:59:21 -07:00
Livar
13603f7be6
Merge pull request #1072 from riarenas/riarenas/fake-package
Add a fake nupkg project to be published to make dependency uptake ea…
2019-03-27 12:03:27 -07:00
jbeisner
5cc5e58dc8 Accessibility Insights warnings: tab stops and bounds fix. 2019-03-25 19:24:50 +00:00
Ricardo Arenas
da9a0ace42 Add a fake nupkg project to be published to make dependency uptake easier 2019-03-20 13:31:47 -07:00
John Beisner
ab479d5ed5
Include the WindowsDesktop targeting pack MSI in the SDK bundle installation. (#1062) 2019-03-19 14:15:32 -07:00
Livar
4d0678083d
Merge pull request #673 from dotnet/merges/release/3.0.1xx-to-master
Merge release/3.0.1xx to master
2019-03-18 10:47:45 -07:00
Nick Guerrera
1763e0dc07
Set DOTNET_ROOT appropriately in internal build Init.cmd (#993) 2019-03-14 16:40:43 -07:00
John Beisner
df11eb9367
SDK bundle installer and Accessibility Insights warnings (#1012)
* Addressing Accessibility Insights warnings regarding the consideration of 'Image' and 'Text' tags having 'Name' attributes.
2019-03-14 08:44:39 -07:00
Nick Guerrera
ddc9c162ed
Don't exclude files starting with . from nupkgs (#994)
This was preventing `dotnet --info` and `dotnet --version` from working
in internal build scenario.
2019-03-12 18:39:16 -07:00
Livar Cunha
28f32808f8 Merge remote-tracking branch 'upstream/release/3.0.1xx' into merges/release/3.0.1xx-to-master
* upstream/release/3.0.1xx: (109 commits)
  Updating the implicit 1.0/1.1 runtime versions for self-contained apps.
  Update dependencies from https://github.com/dotnet/toolset build 20190312.2
  Update dependencies from https://github.com/dotnet/toolset build 20190312.1
  Update dependencies from https://github.com/dotnet/toolset build 20190311.5
  Update dependencies from https://github.com/dotnet/toolset build 20190311.4
  Update dependencies from https://devdiv.visualstudio.com/DevDiv/_git/DotNet-Trusted build 20190311.38
  [release/3.0.1xx] Update dependencies from dotnet/toolset (#974)
  [release/3.0.1xx] Update dependencies from  1 repositories (#973)
  Update dependencies from https://github.com/dotnet/toolset build 20190311.1 (#972)
  [release/3.0.1xx] Update dependencies from  1 repositories (#926)
  Update dependencies from https://github.com/dotnet/standard build 20190308.1 (#939)
  Update dependencies from https://github.com/dotnet/core-setup build 20190309.01 (#935)
  [release/3.0.1xx] Update dependencies from dotnet/core-setup (#933)
  Update dependencies from https://github.com/dotnet/toolset build 20190308.9 (#930)
  Update dependencies from https://github.com/dotnet/toolset build 20190308.7 (#929)
  Update dependencies from https://github.com/dotnet/toolset build 20190308.8 (#928)
  Update dependencies from https://github.com/dotnet/toolset build 20190308.6 (#925)
  [release/3.0.1xx] Update dependencies from  1 repositories (#918)
  Update dependencies from https://github.com/dotnet/core-setup build 20190308.09 (#924)
  Update dependencies from https://github.com/dotnet/toolset build 20190308.5 (#921)
  ...

Conflicts:
eng/Version.Details.xml
eng/Versions.props
eng/common/generate-graph-files.ps1
global.json
src/redist/targets/GenerateBundledVersions.targets
2019-03-12 12:35:50 -07:00
Livar Cunha
facf810423 Updating the implicit 1.0/1.1 runtime versions for self-contained apps. 2019-03-12 10:26:26 -07:00
Livar Cunha
ae9a00dc2e Updating the implicit 1.0/1.1 runtime versions for self-contained apps. 2019-03-12 10:21:31 -07:00
dotnet-maestro[bot]
d72abce213 [release/3.0.1xx] Update dependencies from dotnet/toolset (#824)
* Update dependencies from https://github.com/dotnet/toolset build 20190304.4

This change updates the following dependencies
- Microsoft.Dotnet.Toolset.Internal - 3.0.100-preview3.19154.4

* Pull toolset from new location
2019-03-04 09:03:03 -08:00
John Beisner
6aed0cd361
Fixing the SDK bundle installer's versioning. (#755) 2019-03-01 13:07:12 -08:00
John Beisner
7a40c294b8
Replace "MIT License" with ".NET Library EULA" in SDK bundle installer. (#757) 2019-03-01 13:06:49 -08:00
Livar Cunha
51323db8aa Undoing the 1.x implicit version changes. Those bits are not available in a feed yet. 2019-03-01 09:51:50 -08:00
Livar Cunha
d81616de3e Undoing the 1.x implicit version changes. Those bits are not available in a feed yet. 2019-03-01 09:51:05 -08:00
Livar
35fa79bcdc Updating self-contained app implicit versions 2019-03-01 08:53:16 -08:00
Livar
651147ff49
Updating self-contained app implicit versions 2019-03-01 08:51:14 -08:00
Nate McMaster
49d8bc9941
Update SDK to use aspnet runtime packs (#754)
React to deprecation of Microsoft.AspNetCore.App.

Changes:
* Update KnownFrameworkReference to use the new runtime packs
* Stop reference Microsoft.AspNetCore.App
* Stop generating unused variable in the SDK: BundledAspNetCoreAppPackageVersion and BundledAspNetCoreAppTargetFrameworkVersion
* Add prodcon entries for all aspnet dependencies. These may not have the same version in the future (like patch updates)
2019-02-28 10:13:03 -08:00
Nick Guerrera
85ce55487a
Use WindowsDesktop.App.*Ref*, add more packs to .zip (#698) 2019-02-26 11:09:56 -08:00
Nick Guerrera
18101b4d6c Merge branch 'master' into merges/release/3.0.1xx-to-master 2019-02-23 08:21:25 -08:00
John Beisner
3172bcef35
Modify the 'InstallLocation' registry key. (#636)
Before = SOFTWARE\dotnet\Setup\InstalledVersions\<arch>\sdk
After = SOFTWARE\dotnet\Setup\InstalledVersions\<arch>
2019-02-22 16:48:10 -08:00
Nate McMaster
5e940ca125
Replace aspnetcore-dev myget feed with dotnetfeed (#653) 2019-02-22 16:15:10 -08:00
Daniel Plaisted
d3a4753ef5 Merge release/3.0.1xx' into master 2019-02-21 14:33:02 -08:00
Nick Guerrera
557c5609d7
Fix typo in DOTNET_MULTILEVEL_LOOKUP in Init.cmd (#634) 2019-02-21 13:02:05 -08:00
Nick Guerrera
7ab11b8119
Add cxspec to overlay resolver on msbuild (#622) 2019-02-21 07:25:08 -08:00
Daniel Plaisted
faad6455bc Use .Ref targeting packs and include in layout under packs folder 2019-02-20 16:36:41 -08:00
John Beisner
703e3fd469
Include the targeting pack MSI in the SDK bundle installation (#588)
* Include the targeting pack MSI in the SDK bundle installation.
2019-02-20 16:36:11 -08:00
Daniel Plaisted
b122749d1f Fix .NET Standard targeting pack version 2019-02-20 09:27:45 -08:00
dotnet-maestro[bot]
b02292a944
[release/3.0.1xx] Update dependencies from dotnet/toolset (#596)
* Update dependencies from https://github.com/dotnet/toolset build 20190219.13

This change updates the following dependencies
- Microsoft.Dotnet.Toolset.Internal - 3.0.100-preview3.19119.13

* Update dependencies from https://github.com/dotnet/toolset build 20190219.15

This change updates the following dependencies
- Microsoft.Dotnet.Toolset.Internal - 3.0.100-preview3.19119.15

* Update dependencies from https://github.com/dotnet/toolset build 20190219.16

This change updates the following dependencies
- Microsoft.Dotnet.Toolset.Internal - 3.0.100-preview3.19119.16

* In test projects, append to RestoreAdditionalProjectSources instead of replacing it

9ffae2ef94

* Don't crossgen reference assemblies redisted with msbuild for RoslynCodeTaskFactory

* Don't try to chmod RunFsc.sh that no longer exists
2019-02-20 08:07:45 +00:00
John Beisner
131cc45593
Enabling the upgrade of the SDK bundle in a product-band (#530)
* Enabling the 'upgrade' of the SDK bundle in a 'product-band'.
2019-02-19 14:21:54 -08:00
Nick Guerrera
39648da4dc
Add package with MSBuild SDK resolver for internal build consumption (#478)
* Add package with MSBuild SDK resolver for internal build consumption

* Fix `dotnet pack` of redist.csproj without having built everything first
2019-02-14 18:21:23 -08:00
Daniel Plaisted
5ce70fe86f Merge release/3.0.1xx into master 2019-02-13 09:59:07 -08:00
Daniel Plaisted
43f5bbf70c Update latest patch versions 2019-02-12 18:00:04 -08:00
Daniel Plaisted
25b7ea2285 Add bundled version information for targeting .NET Standard 2.1 2019-02-12 16:48:43 -08:00
William Li
9f9afa1f76 Remove chmod
Per https://github.com/Microsoft/visualfsharp/pull/5882
This file is no longer needed and removed
2019-02-10 20:48:37 -08:00
Livar Cunha
d07048411e Updating the branch info and the readme page to include release/3.0.1xx branch. 2019-02-08 17:36:41 -08:00
Livar Cunha
d134de74e8 Updating the branding to preview3 and adding the branch to CI. 2019-02-08 13:50:45 -08:00
Livar
a786b27938
Updating the branding to preview4 2019-02-08 13:47:14 -08:00
John Beisner
04f4a02a7c Update release notes permalink for 3.0 2019-02-08 00:39:34 +00:00
John Beisner
c378d31a21
Updating the SDK bundle's purple color to .Net core's latest branding (#389)
* Updating the SDK bundle's purple color to .Net core's latest branding.
* Updating per code review...
2019-02-06 10:52:56 -08:00
Daniel Plaisted
391a32838d Add KnownAppHost item 2019-02-01 14:16:53 -08:00
Livar Cunha
531200169f Updating the property name for toolset dependency uptake based on the fake package being published there. 2019-01-15 15:37:37 -08:00
Livar
14d2114d98
Merge pull request #276 from livarcocc/fix_linux_arm64_asp_runtime
We were not including asp.net on arm64 linux builds.
2019-01-11 16:33:52 -08:00
Livar Cunha
7526059d57 Asp.net is actually available in all platforms we support. Removing the condition on including asp.net's archive in our builds. 2019-01-11 16:09:55 -08:00
Livar
5ad3dfdf29
Merge pull request #275 from livarcocc/prepare_for_darc_toolset_update
Updating the toolset version property to match the package name publi…shed by dotnet/toolset repo.
2019-01-11 16:02:36 -08:00
Livar Cunha
6ac9c495a0 We were not including asp.net on arm64 linux builds. 2019-01-11 15:50:34 -08:00
Nick Guerrera
7522ad768a Move VS internal transport nupkgs to NonShipping
These nupkgs don't ship
2019-01-11 14:53:58 -08:00
Livar Cunha
9d6ed02444 Updating the toolset version property to match the package name published by dotnet/toolset repo. This allows for darc updates for toolset versions. 2019-01-11 14:32:52 -08:00
Nick Guerrera
d2491511e5 Generate nupkg of .NET Core SDK for internal build consumption
Also clean up a bunch of issues with the generatenupkg script:
* Output from nuget pack was getting lost
* Non-existent file was imported
* Literal '-ForegroundColor Green' was printed to the screen (didn't actually change the color)
* nuget.exe was being put inside the src/ tree, moved to artifacts/Tools/nuget
* Temporary nuspec was created unnecessarily, now use -Properties instead of search and replace
* Downgraded to nuget 3.5.0 to workaround a perf issue in nuget 4.x pack
2019-01-11 13:55:57 -08:00
Adam Yoblick
d47f13eb96 added windowsdesktop container to support new feed we're pushing packages to 2019-01-10 16:46:16 -06:00
Nick Guerrera
e4774f097b
Bump latest patch version for 2.1 and 2.2 (#254) 2019-01-08 17:37:10 -08:00
Sarabjot Singh
08912895ba Insertion for 3.0 test templates. 2019-01-08 13:43:34 +05:30
Daniel Plaisted
b1267bdc87 Use correct version of Microsoft.NETCore.App for calculating dependencies for bundled versions 2019-01-03 16:15:34 -08:00
Daniel Plaisted
2234a0182c Use more descriptive filename for runtime identifier graph file 2019-01-03 15:15:55 -08:00
Daniel Plaisted
0af7d1c187 Bundle runtime graph file in SDK 2019-01-03 14:58:20 -08:00
Daniel Plaisted
efdaa5f427 Escape semicolons when generating bundled versions 2018-12-31 17:13:06 -08:00
Daniel Plaisted
8d071f3d19
Merge pull request #230 from dsplaisted/additional-known-framework-info
Additional information about shared frameworks to bundled versions
2018-12-31 10:51:25 -08:00
Daniel Plaisted
9efaad971f Include runtime pack and other additional information for known frameworks 2018-12-30 00:14:44 -08:00
Livar Cunha
00aba8b3d0 Fixing FreeBSD build. 2018-12-28 15:16:07 -08:00
Livar
88a1a412d3
Merge pull request #227 from livarcocc/fix_pkg_installer
Fixes the layout of the dotnet-internal artifacts
2018-12-27 15:53:52 -08:00
Livar
ae5f9ac795
Merge pull request #225 from livarcocc/fix_tar_gz_generation
Adding a call to generate a targz for the combined Sdk + runtimes.
2018-12-27 15:46:52 -08:00
Livar Cunha
b46aa5d68e Fixes the layout of the dotnet-internal artifacts, which are used by the chained pkg, msi and -internal.zips/tarballs. We were flattenning all files in the folder. 2018-12-27 15:33:02 -08:00
Livar
0433e6b549
Addressing code review comment.
Fixing the set of files we put in the internal.tar.gz file.
2018-12-27 15:27:24 -08:00
Livar Cunha
5df3288c55 Adding a call to generate a targz for the combined Sdk + runtimes. We were missing that. 2018-12-27 15:01:45 -08:00
Livar Cunha
990a41eab1 Fixing the version branding for this repo back to preview. 2018-12-26 15:06:23 -08:00
Livar Cunha
3336f6a113 Updating the branch, for copy to latest blob storage, to master. 2018-12-26 14:07:55 -08:00
Livar
f89ff73408 Fixing MSI generation. We were missing the Windows desktop version as a parameter to the bundle script. 2018-12-26 10:46:40 -08:00
Livar Cunha
3ce8eaefaa Merge branch 'master' into official_builds
* master:
  Adding a Wpf and Winforms templates registry key (#218)
  Update coresetup to preview-27218-01 (#216)
  Update WindowsDesktop Framework (#215)
  Update coresetup to preview-27217-02 (#214)
  Update coresetup to preview-27217-01
  Update coresetup to preview-27216-02 (#211)
  make GivenDotnetUsesDotnetTools test optional based on AspNetCore availability (#207)
  Update DependencyVersions.props
  Include the WindowsDesktop sharedframework in install 'Finish' page. (#208)
  Update readme; core-sdk:master (#209)
  Update WindowsDesktop
  Update toolset
  Update coresetup to preview-27214-02
  change debug to Debug to match managed part
  add entry for freebsd to badge processing
  update stage0 sdk to 3.0 preview
  Update coresetup to preview-27206-02 (#202)
  initial support for freebsd
2018-12-25 19:08:40 -08:00
Parallels
d3e2ea2488 Fixing debs generation. The issue was that we were losing the exec permission on the apphost in the sdk folder. This caused it to not be picked up by dh_shlibsdeps. This happened because the order of the apphost acquisition was changed to be after crossgen, where we change permissions of all files under the SDK folder to 644. The fix here was to make the apphost acquisition to happen after crossgen. 2018-12-25 11:52:51 -08:00
Livar Cunha
be52214b62 Align the publishing properties between publish and copy latest and use the right key for the cli storage blob. 2018-12-21 21:27:03 -08:00
Livar Cunha
4556ac7915 Don't produce a sha file for cab files. We don't upload those. 2018-12-21 20:41:34 -08:00
Livar Cunha
23b7b332e6 Producing and publishing checksums. Also, publishing sdk assets ourselves, so that we can add metadata regarding where to push nupkgs. 2018-12-21 19:42:48 -08:00
Livar
92217daaa8 Removing strong name signing from our signing and fixing crossgen for arm. 2018-12-20 21:26:49 -08:00
Livar
b86ce49e8e Updating the YAML file to run ci and signing. 2018-12-20 15:25:20 -08:00
Livar Cunha
db5b588e45 Copy latest to blob when all legs succeed. 2018-12-20 13:21:18 -08:00
Livar
a7476cb30c
Merge pull request #153 from wfurt/freebsd
Unofficial support for freebsd
2018-12-11 11:06:45 -08:00
Daniel Plaisted
ee9799118e Remove commented out code 2018-12-06 18:22:29 -08:00
Daniel Plaisted
4980693ed6 Change release suffix to "arcade" 2018-12-06 14:07:36 -08:00
Daniel Plaisted
a84cda76e2 Create nupkg for VS insertion 2018-12-06 13:32:32 -08:00
Daniel Plaisted
f2481a29b3 Correctly generate internal and combined archives 2018-12-06 13:31:59 -08:00
Daniel Plaisted
5c56d2c273 Glob for .cab files to sign 2018-12-06 13:14:44 -08:00
Daniel Plaisted
583de7f027 Sign MSI and Bundle 2018-12-06 10:49:10 -08:00
Daniel Plaisted
f974e2bbac Merge upstream changes 2018-12-05 18:08:40 -08:00
Daniel Plaisted
60f6fe6496 Disable generating DEB packages
https://github.com/dotnet/core-sdk/issues/201
2018-12-05 18:02:18 -08:00
Daniel Plaisted
c6b78f4205 Use different dotnet and artifacts folders when running in docker (on Windows)
This means docker builds won't conflict with each other or with a non-docker build
2018-12-05 17:48:17 -08:00
Daniel Plaisted
2b9f55496d Remove dependency on target which doesn't exist 2018-12-05 14:02:31 -08:00
Daniel Plaisted
42c0ecb69a Hook up building installers to Pack target 2018-12-05 12:21:56 -08:00
Daniel Plaisted
406519bc8a Sign layout 2018-12-04 22:59:19 -08:00
Daniel Plaisted
6c8f08bbd9 Include AppHostTemplate 2018-12-03 18:58:43 -08:00
Daniel Plaisted
55841f78ea Crossgen layout 2018-12-03 18:15:31 -08:00
Daniel Plaisted
9c18e156fe Merge upstream changes 2018-12-03 18:10:32 -08:00
Daniel Plaisted
d4db5e64b5 Merge upstream changes 2018-11-29 17:27:58 -08:00
Daniel Plaisted
bde288e6d0 Don't include WindowsDesktop in ARM builds 2018-11-23 09:56:43 -08:00
Daniel Plaisted
d8b5dbb44b Apply code review feedback 2018-11-21 18:43:34 -08:00
Daniel Plaisted
23a826b544 Merge upstream changes 2018-11-21 15:53:12 -08:00
Daniel Plaisted
67c4e27948 Merge upstream changes 2018-11-20 18:45:43 -08:00
Daniel Plaisted
7b76c6dd89 Generate version file 2018-11-20 10:46:41 -08:00
Livar
25046ed471
Merge pull request #154 from dotnet/enable_win_arm
Enabling win-arm CI and builds.
2018-11-19 21:53:17 -08:00
Livar Cunha
6f3303f309 Enabling win-arm CI and builds. 2018-11-16 17:54:46 -08:00
User Toweinfu
36dfe5b5a9 initial support for freebsd 2018-11-16 17:51:51 -08:00
Livar Cunha
60aadab0a8 Stop downloading and add the lzma archive to the SDK output. 2018-11-16 17:02:14 -08:00
Daniel Plaisted
88fda677f3 Remove debugging code 2018-11-16 15:21:09 -08:00
Daniel Plaisted
f69d1f0fd3 Rename DesktopUI to WindowsDesktop 2018-11-16 15:20:52 -08:00
Daniel Plaisted
48c2d3ef4f Merge upstream changes 2018-11-16 13:56:21 -08:00
Daniel Plaisted
0bf42114de Include bundled tools in layout 2018-11-13 15:04:44 -08:00
Daniel Plaisted
b1b9dfda09 Include templates in layout 2018-11-12 15:23:44 -08:00
Daniel Plaisted
45c3817d65 Generate bundled versions 2018-11-12 11:52:19 -08:00
Daniel Plaisted
853a27da6f Add workaround for tar warning about "file changed as we read it" in Docker under Windows host 2018-11-08 08:10:33 -08:00
Daniel Plaisted
f4209b9de6 Don't try creating tar.gz archive on Windows 2018-11-07 18:17:30 -08:00
Daniel Plaisted
2bee59a9bc Create Mac PKG 2018-11-06 14:29:00 -08:00
Daniel Plaisted
8c9e6aea55 Move / rename PKG generation targets 2018-11-05 14:11:42 -08:00
Daniel Plaisted
24ccfbae1a Generate RPM Installer 2018-11-05 13:38:10 -08:00
Daniel Plaisted
d2528332b2 Move, merge, and rename RPM targets 2018-11-04 18:52:13 -08:00
Daniel Plaisted
143bee75ff Produce deb packages 2018-11-01 23:15:59 -07:00
Daniel Plaisted
8d026b422e Move and merge deb generation targets 2018-10-31 16:42:59 -07:00
Daniel Plaisted
1e32ccfb7e Generate Windows installers 2018-10-31 16:35:14 -07:00
Daniel Plaisted
6c0c9119fc Move and rename MSI installer targets 2018-10-31 12:43:19 -07:00
Daniel Plaisted
70dd736032 Create archives for core SDK layout 2018-10-29 13:31:03 -07:00
Daniel Plaisted
ce468ec79e Move layout folder 2018-10-29 12:26:31 -07:00
Daniel Plaisted
b155e4e8bf Multitarget core sdk tasks 2018-10-29 11:37:13 -07:00
Daniel Plaisted
ac23150af3 Include DesktopUI shared framework and toolset in redist layout 2018-10-24 16:05:02 -07:00
Daniel Plaisted
584ec3c3d6 Add more components to download / layout 2018-10-24 00:08:51 -07:00
Daniel Plaisted
1344cb26c2 Lay out components in publish directory 2018-10-23 23:15:58 -07:00
Daniel Plaisted
7ab1aa5a6c Set up infrastructure to download bundled components for layout 2018-10-23 18:16:45 -07:00
Daniel Plaisted
2e76a1e5fd Build Core SDK tasks to separate folder for consumption during main build 2018-10-22 20:04:13 -07:00
Daniel Plaisted
914f465b30 Get tests and skeleton build tasks building 2018-10-22 19:59:58 -07:00
Egor Chesakov
71f120f27d Enable CrossgenPublishDir for arm and arm64 in src/redist/redist.csproj 2018-10-13 10:10:12 -07:00
Livar
2c2238a572 Adding the winforms and wpf runtime to the SDK. For now, only for zips, as we don't have a msi yet to bundle up. 2018-08-13 17:04:48 -07:00
jbeisner
1537818815 The target: "PublishVersionFile" fails to fire as it is pinned to [line 30] AfterTargets="Publish" and [line 118] BeforeTargets="Publish" 2018-08-07 17:38:24 +00:00
Chris Rummel
5fab2468f5
Add dependency for restoring packages before trying to find Microsoft.NETCore.DotNetAppHost package.
This appears to be a difference between the 2.2.0-preview SDK currently
being used in core-sdk and the 2.1.401-preview SDK currently being used
in source-build.  In the 2.2.0 SDK, this target happens to run before
the resolved package list is used, but in the 2.1.401 it is not, so I
added the explicit dependency (doesn't affect anything in the 2.2.0 SDK).
2018-07-18 21:04:14 -05:00
jbeisner
d88a7ce337 The SDK-version directory under the SDK directory should match the advertised SDK version. 2018-07-17 16:40:52 +00:00
Daniel Plaisted
b3be19b820 Fix up runtimeconfig.json files for tools (dotnet, MSBuild, VSTest, etc) to target .NET Core 3.0 2018-07-09 13:46:04 -07:00
Parallels
4d9b015f8f Fixing a merge issue and crossgen issues. 2018-06-26 14:44:55 -07:00
Livar Cunha
e2b679c4bb Merge branch 'master' of /Users/livarcocc/Documents/git/cli into merge_master_cli
* 'master' of /Users/livarcocc/Documents/git/cli: (1063 commits)
  Updating signing project to use new intermediate directory (int).
  Update runtimeconfig.json doc for 2.1 (#9382)
  Shortening the path to the intermediate folder by renaming it to int.
  fix typo (#9364)
  Updating asp.net to 2.2.0 as well.
  Updating the build and tests to work with the 2.2.0 runtime.
  Simplified combining dictionaries in Telemetry
  Fixing 'Channel' and 'BranchName': "release/2.1.4xx" to "master" (#9362)
  Fix extraction of folders (#9335)
  Update Sha256Hasher.cs
  Fix relative path tool path (#9330)
  Insert updated SDK from 2.1.4xx branch
  MSBuild 15.8.60
  Fix crash when user home directory cannot be determined.
  Make `CliFolderPathCalculator` a static class.
  Don't add the ReleaseSuffix to the branding on the CLI when DropSuffix is set to true.
  Add retry when Directory.Move (#9313)
  Override new SdkResult public properties
  Add reference to Microsoft.Build.NuGetSdkResolver
  Disable crossgen for MSBuild inline-task refs
  ...
2018-06-25 22:38:01 -07:00
Livar
0e346aa5ba
Merge pull request #9360 from SimonCropp/patch-1
Update Sha256Hasher.cs
2018-06-05 22:46:18 -07:00
Livar
670dcedba2
Merge pull request #9381 from dotnet/merges/release/2.1.4xx-to-master
Merge release/2.1.4xx to master
2018-06-05 22:45:53 -07:00
William Li
48ee97fb42
Merge pull request #9371 from svick/patch-4
Simplified combining dictionaries in Telemetry
2018-06-04 13:43:13 -07:00
Livar
447bd91100
Merge branch 'master' into merges/release/2.1.4xx-to-master 2018-06-04 11:38:31 -07:00
Maira Wenzel
7ce47778b4 fix typo (#9364)
* fix typo

* add loc files
2018-06-01 14:16:41 -07:00
Livar
80d542b8f4
Merge pull request #9332 from dotnet/merges/release/2.1.4xx-to-master
Merge release/2.1.4xx to master
2018-05-31 10:22:00 -07:00
Petr Onderka
139fc86dbc
Simplified combining dictionaries in Telemetry 2018-05-31 01:03:27 +02:00
Simon Cropp
ca8fefb1be
Update Sha256Hasher.cs 2018-05-29 23:00:23 +10:00
William Li
983612b95b
Fix relative path tool path (#9330)
Pass full path to Path.GetRelativePath
2018-05-24 18:15:23 -07:00
Peter Huene
b1f8eb1d8d
Fix crash when user home directory cannot be determined.
Currently, dotnet will crash with an `ArgumentNullException` if `USERPROFILE`
(Windows) or `HOME` (macOS and Linux) is not set in the environment.  This
is because there is a missing null check after retrieving the environment
variable's value.  Additionally, if either variable is set to an empty string,
a `.dotnet` directory is created in the current directory where dotnet is being
run.

This commit fixes this by printing a graceful error informing the user the home
directory could not be determined and to set `DOTNET_CLI_HOME` to the directory
to use.  This variable will be respected before `USERPROFILE` or `HOME`. It is
likely that CI environments where `HOME` is not set can use `DOTNET_CLI_HOME`
to specify a local temporary location; by using this variable rather than
setting `HOME`, it is guaranteed to only affect dotnet.

It was discussed that we should perhaps fallback to some temporary location if
the home directory could not be determined, but NuGet currently requires `HOME`
to be set to work.  Because of this, it was decided that we should just handle
this case gracefully and provide a way for users to override the home directory
without relying on `USERPROFILE`/`HOME` entirely.

Closes #8053.
2018-05-22 17:34:39 -07:00
Peter Huene
3e962bc131
Make CliFolderPathCalculator a static class.
The `CliFolderPathCalculator` class implements no interface and has no instance
fields.

This commit therefore makes it a static class.
2018-05-22 17:34:39 -07:00
Livar
6f6f28dac6
Merge pull request #9323 from dotnet/merges/release/2.1.4xx-to-master
Merge release/2.1.4xx to master
2018-05-22 13:28:50 -07:00
Livar
8f8770be8a
Merge pull request #9265 from livarcocc/first_run_native_intallers
Always execute cache expansion on native installers.
2018-05-22 13:17:55 -07:00
William Li
ca8a109d1c
Add retry when Directory.Move (#9313) 2018-05-22 09:55:10 -07:00
Andy Gerlicher
5e794a064c Add reference to Microsoft.Build.NuGetSdkResolver 2018-05-21 15:29:37 -07:00
Andy Gerlicher
7bed83fc98 Disable crossgen for MSBuild inline-task refs 2018-05-21 15:29:37 -07:00
Peter Huene
88e2e9e993
Improve command line help user experience.
This commit attempts to make the command line help user experience for `dotnet`
more consistent for all of the built-in SDK commands.

The following has been changed:

* Organized the top-level help into a section detailing how to run .NET
  applications and a section on running SDK commands.
* Sorted the SDK commands by name (previous ordering was undefined).
* Removed `--verbosity` from the "common options section" since it is not a
  top-level option, nor is it common to all commands.
* Added missing parameter names for parameterized options (especially for the
  `dotnet tool` subcommands).
* Fixed the localization of parameter names for parameterized options.
* Added missing `PROJECT` parameter to a few commands.
* Fixed the localization of the build command's `PROJECT` parameter description.
* Fixed the confusing descriptions for the `--framework`, `--configuration`,
  and `--runtime` options that were being shared between different commands.
* Fixed the "unknown command" error for `dotnet help <command>` to show in red.
* Deleted .resx for `dotnet msbuild` that is no longer used.
* Change the option descriptions to be more consistent in their grammatical
  structure.
* Removed extra blank line from end of help output.

Fixes #7431.
Fixes #9230.
Fixes #9165.
2018-05-18 16:43:31 -07:00
Livar
c921ea92b8
Merge pull request #9309 from dotnet/merges/release/2.1.4xx-to-master
Merge release/2.1.4xx to master
2018-05-17 15:17:50 -07:00
Livar Cunha
e5e2256ae9 Addressing code review comments by making the Configuration class's fields readonly. 2018-05-17 14:13:14 -07:00
Livar
e338e46e10
Merge pull request #9306 from dotnet/merges/release/2.1.4xx-to-master
Merge release/2.1.4xx to master
2018-05-17 13:41:23 -07:00
Peter Huene
b5b47dd40d
Merge pull request #9294 from peterhuene/fix-completion
Improve command completion.
2018-05-17 11:02:57 -07:00
Peter Huene
d79f3ead27
Merge pull request #9292 from peterhuene/fix-sln-list
Fix header output by `dotnet sln list`.
2018-05-17 10:59:15 -07:00
Peter Huene
7be6af8c3b
Merge pull request #9302 from mayankbansal018/dotnetvstestargs
Multiple Logger/TestAdapter inputs from dotnet CLI
2018-05-17 10:41:01 -07:00
Livar
f23377b19f
Merge pull request #9299 from dotnet/merges/release/2.1.3xx-to-release/2.1.4xx
Merge release/2.1.3xx to release/2.1.4xx
2018-05-17 10:35:31 -07:00
Mayank Bansal
b584750620 Multiple Logger/TestAdapter inputs from dotnet CLI 2018-05-17 12:54:39 +05:30
Peter Huene
b24e9f4cec
Add unit tests for dotnet complete.
This commit adds a few simple unit tests to cover the `dotnet complete`
command.

It only checks the top-level output, integration with the `new`
command from the templating engine, and the custom `nuget` command parser that
is solely intended for use with `dotnet complete`.
2018-05-16 17:19:06 -07:00
Peter Huene
089d8bfc1b
Remove internal-reportinstallsuccess from dotnet complete.
This commit removes `internal-reportinstallsuccess` from `dotnet complete` by
changing the command's help text to an empty string.  This causes the parser to
treat the command as hidden and does not match the command name for
suggestions.

Fixes #9111.
2018-05-16 14:07:33 -07:00
Peter Huene
6f184070f0
Improve command completion.
This commit improves command completion by updating the `new` and `nuget` parsers to
match their current supported syntax.  Removes the unnecessary description
strings that were not used (these commands are parsed by assemblies external to
the CLI). The top level options are also sync'd to the currently supported
options.

Additionally, it unhides the `msbuild` and `vstest` commands so that `dotnet
complete` suggests them.

Fixes #9286.
2018-05-16 14:07:27 -07:00
Livar Cunha
2531e3a136 Add NoWarn for the stable package depending on non-stable package when packaging Cli.Utils for tests. 2018-05-16 12:44:23 -07:00
John Beisner
baeb21728d
Merge pull request #9285 from dotnet/merges/release/2.1.4xx-to-master
Merge release/2.1.4xx to master
2018-05-16 09:00:04 -07:00
Peter Huene
63d30787b9
Fix header output by dotnet sln list.
The `dotnet sln list` command uses `Project reference(s)` as the header for the
output instead of `Project(s)`. To be consistent with Visual Studio, the header
should refer to these as projects rather than project references as users can't
add "project references" to a solution.

This commit changes the header to `Project(s)`.

Additionally, the command now filters out solution folders and only shows
projects.

Fixes #9246.
2018-05-15 23:06:36 -07:00
John Beisner
08b20ef268
Merge pull request #9275 from dotnet/merges/release/2.1.3xx-to-release/2.1.4xx
Merge release/2.1.3xx to release/2.1.4xx
2018-05-15 09:17:36 -07:00
Livar
69062dda4e
Merge pull request #9266 from dotnet/merges/release/2.1.4xx-to-master
Merge release/2.1.4xx to master
2018-05-14 09:47:53 -07:00
Peter Huene
1feaa0385a
Fix incorrect default VSTest verbosity level.
Commit 10289504a8 changed the default verbosity
option used for MSBuild from `-v:quiet` to `-verbosity:quiet`.  This triggered a
match that was being done against arguments starting with `-verbosity` to
forward the value to VSTest via the `VSTestVerbosity` property.  The result is
that VSTest is using a default verbosity of `quiet`, suppressing error output
that users expect to see.

The fix is to change the check to only match against user-supplied options.
The default level the command uses for MSBuild is not forwarded to VSTest.

Fixes #9229.
2018-05-11 20:03:24 -07:00
Livar
11f2843f7b
Merge pull request #9252 from dotnet/merges/release/2.1.3xx-to-release/2.1.4xx
Merge release/2.1.3xx to release/2.1.4xx
2018-05-11 10:16:04 -07:00
Livar Cunha
b7a8c6d12f Introducing a Config object as a input to the FirstRunConfigurer. This allows us to decide what operations we want to
do as part of first run based on whether this is the invoke-reportsuccess from a native installer or a regular command
being invoked for the first time. This in turn allows us to ignore the skip first run variable on native installers and
expand the cache always in those cases.
2018-05-10 15:27:12 -07:00
jbeisner
e1ec232c47 Merge remote-tracking branch 'origin/release/2.1.4xx' into merges/release/2.1.4xx-to-master 2018-05-09 21:12:09 +00:00
Peter Huene
0f0f70ce48
Fix adding tools directory to PATH for native installers.
This commit fixes adding the tools directory to the user's PATH for the native
installers.

The issue was a regression caused by #8886.  The change used a "no-op" sentinel
file that reported it existed.  This "no-op" sentinel was used for the native
installers.  Unlike the other "no-op" sentinels used by the native installer,
we do want PATH to be modified by the native installer.

The fix is to change the "no-op" sentinel to report the file doesn't exist, but
also to not to attempt to create the file.

This fixes #9208.
2018-05-07 16:35:29 -07:00
Livar
6cc9ce45e8
Merge pull request #9028 from livarcocc/add_remove_messages
Updating the description of add/remove nuget packages and references and list
2018-05-07 11:24:58 -07:00
Tanner Gooding
f2f5c1b12b Merge remote-tracking branch 'dotnet/release/2.1.4xx' into merges/release/2.1.4xx-to-master 2018-05-07 10:55:14 -07:00
Tanner Gooding
6d6bf64f28 Merge remote-tracking branch 'dotnet/release/2.1.3xx' into merges/release/2.1.3xx-to-release/2.1.4xx 2018-05-07 08:20:23 -07:00
Livar
e7ebf48578
Merge pull request #9199 from livarcocc/remove_word_please
Removing the word please from the ASP.NET first run message.
2018-05-04 13:25:31 -07:00
Tanner Gooding
481e4a19b3
Merge pull request #9013 from dotnet/merges/release/2.1.2xx-to-release/2.1.3xx
Merge release/2.1.2xx to release/2.1.3xx
2018-05-04 11:00:39 -07:00
Livar Cunha
488711b4ff Removing the word please from the ASP.NET first run message. We are not supposed to use it. 2018-05-04 10:12:00 -07:00
Tanner Gooding
a8856ddccc Merge remote-tracking branch 'dotnet/release/2.1.2xx' into merges/release/2.1.2xx-to-release/2.1.3xx 2018-05-03 15:24:39 -07:00
Livar
bf5ad90bcf
Merge pull request #9182 from wli3/add-bundled-tool-description
Add additional tools to help text
2018-05-03 10:55:37 -07:00
Livar Cunha
8c2160b6a0 Removing some patches for source build. 2018-05-02 11:59:01 -07:00
Livar Cunha
661f058fed Updating the description of add/remove nuget packages and references and list. Also updating the parameter placeholder for add/remove reference. 2018-05-01 16:06:38 -07:00
Livar
f87c6e7d11
Merge pull request #9178 from natemcmaster/namc/disable-aspnet
Add a property to disable bundling ASP.NET Core tools and runtimes
2018-05-01 15:56:32 -07:00
Petr Onderka
6c9942bae6 Use NuGet autocomplete API for add-package suggestions (#9171) 2018-05-01 15:39:12 -07:00
William Li
46d4b71814 Add additional tools to help text 2018-05-01 14:28:15 -07:00
Nate McMaster
c382932ec4
Fix #if to match .csproj constant 2018-05-01 12:45:50 -07:00
Peter Huene
67ecb5ac65
Merge pull request #9161 from v-zbsail/loc_20180427_release_2.1.3xx
LOC CHECKIN | dotnet/cli release/2.1.3xx | 20180427
2018-05-01 11:25:45 -07:00
William Li
57d065e43d
Correct dotnet list description (#9174)
After dotnet tool list moved out of dotnet list, the description has not been updated.
2018-05-01 10:24:40 -07:00
William Li
d681933b87
Rename --source-feed to --add-source (#9164)
* Rename to add-source
2018-05-01 10:21:00 -07:00
Nate McMaster
b0c5fddc04
Add a property to disable bundling ASP.NET Core tools, templates, and runtimes 2018-04-30 17:49:09 -07:00
Zbyněk Sailer
47a65f258a
LOC CHECKIN | dotnet/cli release/2.1.3xx | 20180427 2018-04-30 14:50:26 -07:00
Peter Huene
b23259c30f
Merge pull request #9160 from peterhuene/fix-pid-file-share-mode
Fix Razor server shutdown on Windows.
2018-04-30 14:47:31 -07:00
Peter Huene
eaf5e95996
Merge pull request #9153 from peterhuene/quote-msbuild-properties
Fix MSBuild invocation to quote property option values.
2018-04-27 16:52:02 -07:00
Peter Huene
b2b3947c68
Fix Razor server shutdown on Windows.
On Windows, the Razor server correctly creates the pid file with
`FileAccess.Write` and `FileOptions.DeleteOnClose`.  This requires a share mode
of `FileShare.Write | FileShare.Delete` to open.  However, the
`dotnet build-server shutdown` command was opening the file with
`FileShare.Read`.  As a result, an `IOException` was being thrown and was not
handled.

This change first opens the file with the appropriate share access and also
properly handles a failure to access or read the contents of the pid file.

Additionally, an integration test was added to test that Razor server shutdown
works as expected.

Fixes #9158.
2018-04-27 13:52:17 -07:00
Peter Huene
f9b939fe89
Fix MSBuild invocation to quote property option values.
This commit ensures that any `/property` option's value is surrounded by quotes
to allow MSBuild to properly interpret special characters like semicolons.

Users familiar with MSBuild expect `/property:Name="Value"` to handle
semicolons. However, since `dotnet` parses the command line first, the
quotes get processed by its command line parser.  This results in
`/property:Name=Value` being passed to MSBuild, which will not parse a "Value"
containing a semicolon correctly.

Since it is safe to always quote the property value for this option, this fix
simply ensures that the value is surrounded by quotes.

This fixes the issue for all commands that forward arguments to MSBuild.

Fixes #7791.
2018-04-26 14:38:21 -07:00
Peter Huene
b9597913dc
Fix --source-feed option for tool install and update commands.
Commit 9cc2b7cd2f regressed the `--source-feed`
option so that it no longer accepted relative paths.  Because the option is now
saved to the temp project file, any relative paths specified by the
`--source-feed` option were made relative to the temp project path and not from
the current working directory of where dotnet was run.

The fix is to use `Path.GetFullPath` of the `--source-feed` option, provided
the option specified was not an absolute URI.

Fixes #9132.
2018-04-24 20:43:14 -07:00
Livar
355b08befd
Merge branch 'release/2.1.4xx' into merges/release/2.1.3xx-to-release/2.1.4xx 2018-04-24 14:20:28 -07:00
William Li
270fc4428a
do not set BaseIntermediateOutputPath in temp project of dotnet install (#9122)
Should use MsBuildProjectExtensionsPath instead.

Change the property passin by project file instead of command line. It is more reliable passing path in xml and also the timing of MsBuildProjectExtensionsPath is controlled. (Before loading SDK)
Change mock fake project to use “;” instead, since c:\path contains “:”.
2018-04-24 10:19:27 -07:00
William Li
008e5f3d97
Remove -f short hand in dotnet tool install (#9102) 2018-04-23 13:23:35 -07:00
Peter Huene
1ade191cb6
Implement Razor server discovery by pid file.
Previously, Razor server discovery for the `build-server shutdown` command was
implemented by invoking MSBuild on a project file in the current directory to
evaluate the path to the Razor server dll.  This was problematic since it would
only discover a single running Razor server instance and required that the user
run the `build-server shutdown` command from a specific location.

Razor's server now writes a "pid file" to a well-known location
(`~/.dotnet/pids/build`) which the command can now enumerate to discover, and
shutdown, the running Razor servers.

This commit changes the Razor server discovery to use the pid files and removes
the requirement that users need to run the command in specific directories to
work.

Fixes #9084.
2018-04-20 10:49:31 -07:00
Peter Huene
8e01912b36
Merge pull request #9089 from peterhuene/buildserver-command-rename
Rename buildserver command.
2018-04-18 11:42:54 -07:00
William Li
34060d3a23
pick up nuget loc (#9090) 2018-04-18 11:18:14 -07:00
Peter Huene
3f1ab372b4
Rename buildserver command.
This commit renames the `buildserver` command to `build-server`.

Fixes #9075.
2018-04-17 17:04:12 -07:00
Steve MacLean
8c937a0db0 [Arm64] Add crosscomponent crossgen (#9011) 2018-04-17 16:54:01 -07:00
William Li
ae75392078
Merge pull request #9079 from wli3/help-text-02
Help text improves
2018-04-17 12:21:39 -07:00
William Li
854feefe6f
Give a different error to guide use to install via global tools (#9070)
Give a different error to guide use to install via global tools so, if several bundled DotnetTools cannot finish source build on time. The user can use global tools to get it.

The original plan that adding a different resolver is hard due to resolver can only find dll that will be used to spawn a process. However, the command constructor will give an error message when resolver find null. By adding a different error when the command name is part of the list, it can achieve the same goal.
2018-04-17 12:21:20 -07:00
William Li
fd66168922 Error message has instruction to help investigate from NuGet error message 2018-04-16 21:42:50 -07:00
William Li
b0610b9116 Add doc link for both dotnet-tool and dotnet-buildserver 2018-04-16 21:42:45 -07:00
William Li
6851961c16 Better help text on dotnet tool 2018-04-16 10:51:43 -07:00
Nick Guerrera
c2713b41c3
Merge pull request #9020 from v-zbsail/loc_20180403_master
LOC CHECKIN | dotnet/cli master | 20180409
2018-04-11 17:55:36 -07:00
William Li
b0ee5db411
consume bring your own shim(byos) (#9018)
If there are shims packaged by convention in nupkg. Shim Repository will simply copy it to the right location.

The query interface ToolPackageInstance will be in charge of finding the shim folder and filter the right RID. Shim Repository will pick the right file after the folder is located since Shim Repository knows the shim name and it also book keep the files at uninstallation.
During development, due to the wrong adapter level. The mock duplicated too much logic. So, I corrected the abstraction level to lower (only create shim). And replaced the existing mock with a much smaller one without any atomic control and file move, copy logic. At the same time. The chmod, which is a IO action, causes problem during tests. So I added adapter layer to it and put it in Util.
2018-04-10 15:42:50 -07:00