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

117 commits

Author SHA1 Message Date
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
4ea1958851 Merge branch 'master' into merges/release/3.1.1xx-to-master 2019-10-17 15:43:59 -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
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
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
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
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
John Beisner
ab479d5ed5
Include the WindowsDesktop targeting pack MSI in the SDK bundle installation. (#1062) 2019-03-19 14:15:32 -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
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
Nick Guerrera
85ce55487a
Use WindowsDesktop.App.*Ref*, add more packs to .zip (#698) 2019-02-26 11:09:56 -08:00
Daniel Plaisted
d3a4753ef5 Merge release/3.0.1xx' into master 2019-02-21 14:33:02 -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
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
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 Cunha
6ac9c495a0 We were not including asp.net on arm64 linux builds. 2019-01-11 15:50:34 -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
Daniel Plaisted
0af7d1c187 Bundle runtime graph file in SDK 2019-01-03 14:58:20 -08:00
Livar Cunha
00aba8b3d0 Fixing FreeBSD build. 2018-12-28 15:16:07 -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
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
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
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
7b76c6dd89 Generate version file 2018-11-20 10:46:41 -08:00
Daniel Plaisted
f69d1f0fd3 Rename DesktopUI to WindowsDesktop 2018-11-16 15:20:52 -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
143bee75ff Produce deb packages 2018-11-01 23:15:59 -07:00
Daniel Plaisted
1e32ccfb7e Generate Windows installers 2018-10-31 16:35:14 -07:00
Renamed from src/redist/targets/BundledComponents.targets (Browse further)