Commit graph

82 commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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]
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
Chris Rummel
db6496271c Don't overwrite AspNetCoreSharedFxInstallerRid if it's already set. (#4734) 2019-09-11 15:45:08 -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
jbeisner
2d53cf29ec Removing the RelativeLayoutPath: "shared" for the WinForms and Wpf ArchiveFile 2019-08-09 12:10:43 -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
f55ddb8a15 Adding 2.1 and 2.2 Templates MSIs, part 3 2019-07-22 17:06:16 +00:00
jbeisner
49ad1e8dd5 Adding 2.1 and 2.2 Templates MSIs, part 1 2019-07-17 23:18:41 +00:00
jbeisner
e2eb862efb Creating a Windows MSI for templates. 2019-07-11 00:43:29 +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
194cdca506 Don't reset blob URL if we pass it in. 2019-06-25 12:08:11 -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
Davis Goodin
3985d797c8 Download consolidated dotnet-runtime-deps Deb pkg 2019-05-03 17:18:14 -05:00
Daniel Plaisted
27be26f712 Switch to .Internal insertion package for .NET Core 2019-04-25 08:51:39 -07:00
John Beisner
07b074acf7
adding .Net core AppHost pack (#1519)
* adding .Net core AppHost pack
2019-04-17 12:53:05 -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