Commit graph

277 commits

Author SHA1 Message Date
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
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
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
Daniel Plaisted
c143f5e9b3 Update branding to 3.1.100-preview2 2019-10-14 11:42:24 -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
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
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