mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
18879 commits 41 branches 190 tags 95 MiB
Commit graph

3789 commits

Author SHA1 Message Date
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