Commit Graph

140 Commits

Author SHA1 Message Date
William Godbe 21e56a8174
Include En/US loc resources in bundles (#29066) 2021-01-13 10:25:19 -08:00
William Godbe a8646e3022
Fix .msi names (#28572) 2020-12-10 12:01:51 -08:00
William Godbe a4f30aeec3
Make sure SharedFx & TargetingPack msi names match (#28298)
* Make sure SharedFx & TargetingPack msi names match

* Insert packageVersion into OutputName when available

* Move props around again
2020-12-08 14:14:21 -08:00
William Godbe f17c23bf98
Increase height for longer strings (#28332)
* Increase height for longer strings

* Update thm.xml

* Move fix to Hosting Bundle

* Fixup

* Fixup

* fixup

* Temporarily upload installers

* Fix height
2020-12-08 14:14:10 -08:00
Matt Mitchell a0ab0964d4
[release/5.0] Fix some post-build signing issues (#26506)
* Fix some post-build signing issues
This fixes some post-build signing issues that are present in the aspnetcore repo
1. Add the .msi extension to be signed by Microsoft400 - Msis must be signed. With in-build signing these get handled explicitly by the wixproj infrastructure. When we do post build signing, we must sign these files.
2. Remove the strong name exclusions. These exclusions are incorrect when applied in post-build and unnecessary for in-build signing. Most importantly, the aspnetcore PKT would not end up re-strong named (it doesn't need to be strong name signed by ESRP since it's strong named in-build) because the PKT doesn't match any of the StrongNameSignInfo specified in arcade. The rest of the entries seem to be mostly about optimization. I could not find any performance difference between these entries being present and not. I am not sure whether they actually even apply to any assets. Moreover, when doing post-build signing, they would conflict with the entries in runtime and other places.

Verification - I have a tool that I wrote which unpacks every file between two directories and compares the strong name, nuget, and authenticode certs between equivalent files. This is the same tool being used to verify post-build signing. This tool shows no difference in any aspnetcore produced asset.

Baseline: https://dev.azure.com/dnceng/internal/_build/results?buildId=836183&view=results
Diff: https://dev.azure.com/dnceng/internal/_build/results?buildId=837176&view=results

* Do not push VS packages for installers when PostBuildSign == true

* Output wix command packages to the installers output path

* Don't import microbuild signing targets from wix when PostBuildSign=true

* Tweaks:
- Don't sign wixpacks when not in post-build signing
- Generate a wixpack for both the original msi name (which the wixproj generates) AND the name we use in the final outputs. This is because while these files are the same, signing differentiates the certificate based on the file name, and wixpack lookup is also based on the file names. Aspnetcore and other repos have uses the final outputs (e.g. dotnet-aspnetcore-runtime-123.5..) as well as the internal names (e.g. AspNetCoreSharedFramework_x64.msi).
- Don't sign msi's when not post-build signing.

* Avoid generating sha512 files for wixpack zips

* Don't run xplat code sign jobs if PostBuildSign == true

* Change original target names

* Conditionalize codesign operations

* Add publishing flag for linux x64 and add deb sha512 generation

* Do not push the x64 linux runtime archive more than once
2020-10-14 10:19:10 -07:00
William Godbe c3f89a91ab
Generate non-stable version for installer (#26064)
* Generate non-stable version for installer

* Fix versions

* Add upgrade codes for 3.1.0-3.1.8

* Fixup

* Fixup

* Update src/Installers/Windows/SharedFrameworkBundle/Bundle.wxs

Co-authored-by: Massimiliano Donini <massimiliano.donini@gmail.com>

* Add codes for 3.1.9

Co-authored-by: Massimiliano Donini <massimiliano.donini@gmail.com>
2020-10-01 09:51:30 -07:00
dotnet-maestro[bot] 7e0e801bb4
[release/5.0-rc2] Update dependencies from dotnet/arcade dotnet/efcore (#26058)
[release/5.0-rc2] Update dependencies from dotnet/arcade dotnet/efcore


 - Update installers task location
2020-09-18 19:58:16 +00:00
dotnet-maestro[bot] 9675fdb455
[release/5.0-rc2] Update dependencies from dotnet/arcade (#25963)
[release/5.0-rc2] Update dependencies from dotnet/arcade


 - Update create light/light command package drop task

 - Create output directory
2020-09-16 22:08:01 +00:00
Juan Hoyos dda1d33f7b
Enable ARM64 installers build. (#25579)
Changes WiX toolset used to 3.14 to support ARM64
Generates targeting pack from the x86/x64 leg, as it gets produced using a zip that gets generated there.
The ARM64 leg now produces all the necessary msi's, exe, and wixlib needed for the installer to generate a bundle.
2020-09-10 10:59:37 -07:00
Matt Mitchell 6a3ce0d974
Add light/lit command packages (#25334)
* Add light/lit command packages
This adds light command package generation to aspnetcore.
After build of a wix project, generate a light package based off of the inputs that are sent to light.exe/lit.exe.
2020-08-31 14:19:34 -07:00
Doug Bunting 59433bcadd
Move to latest NuGet.exe (#23786)
* Move to latest NuGet.exe
- 5.3.0 -> 5.6.0
- should improve performance and may improve reliability

* Also switch from NuGet.Build.Tasks to NuGet.Packaging
- move to 5.6.0 version here too
- reduce transitive dependencies; we don't need them all
2020-07-10 10:15:45 -07:00
Kevin Pilch 3117f43c33
Migrate to single sln file + slnf files (#23581) 2020-07-08 15:27:22 -07:00
Chris R e6fcc01f56 Merge branch 'master' into merge/release/3.1-to-master
# Conflicts:
#	src/SignalR/clients/ts/FunctionalTests/yarn.lock
#	src/SignalR/clients/ts/signalr/src/NodeHttpClient.ts
#	src/SignalR/clients/ts/signalr/tests/HttpConnection.test.ts
#	src/SignalR/clients/ts/signalr/tests/TestWebSocket.ts
2020-05-19 12:48:18 -07:00
William Godbe 817127dfd0
[release/3.1] Give .msi's non-stable branding (#21801)
* Give .msi's non-stable branding

* Add BuildNumber to version

* Make GUIDInputs unique per-build
2020-05-14 16:34:09 -07:00
Kevin Pilch f4be244fd1
More updates docs (#20513) 2020-04-03 22:09:36 +00:00
Ryan Nowak 5f8bb71608
Merge pull request #20456 from dotnet-maestro-bot/merge/release/3.1-to-master
[automated] Merge branch 'release/3.1' => 'master'
2020-04-02 11:18:00 -07:00
William Godbe 2d6827a678
Always generate checksums as last part of publish job (#20367)
* Always generate checksums as last part of publish job

* Initialize props correctly

* Fix wildcard

* Import Arcade SDK

* Add NoWarn MSB4011

* Make import conditional on GenerateChecksums

* Select specific files to checksum

* Respond to feedback

* AfterTargets -> BeforeTargets
2020-04-01 16:25:37 -07:00
Kevin Pilch f34033a415 Add .vsconfig files in root and beside slns 2020-03-31 14:25:44 -07:00
John Luo ba6d839f71
Merge branch 'master' into merge/release/3.1-to-master 2020-02-20 16:07:37 -08:00
Stephen Halter 88073f86ff Merge branch 'release/3.1' into master 2020-02-18 13:46:51 -08:00
William Godbe bdb6a38c47
Publish Checksums to dotnetclichecksums storage account (#19038)
* Update dependencies from Arcade

* Try publishing checksums

* Fix some errors

* Set RelativeBlobPath

* Fix publish location

* Centralize ChecksumExtension

* Fix use of ChecksumExtension in publishing.props
2020-02-14 15:28:30 -08:00
Jacques Eloff a633c66dc6
Fix layout of installer help page for non-ENU locales, #18152 (#18246) 2020-02-14 09:31:17 -08:00
Maher Jendoubi 116799fa70 Contributing: Fixed some typos (#18331) 2020-01-14 08:58:52 -08:00
Kevin Pilch 0517745c08 aspnet/AspNetCore -> dotnet/aspnet
Except aspnet/AspNetCore-Internal.
2020-01-08 16:40:11 -08:00
DotNet Bot 1324674163 Merged PR 4703: [internal/release/3.1] Update dependencies from 1 repositories
This pull request updates the following dependencies

[marker]: <> (Begin:48752c90-f78c-49ee-575f-08d76e1d56cb)
## From https://github.com/aspnet/EntityFrameworkCore
- **Build**: 20191210.7
- **Date Produced**: 12/10/2019 8:25 PM
- **Commit**: 813358a5fb4e1f35e5d82463d2bad6616ca6f594
- **Branch**: refs/heads/internal/release/3.1
- **Updates**:
  - **Microsoft.EntityFrameworkCore.Tools** -> 3.1.1-servicing.19610.7
  - **Microsoft.EntityFrameworkCore.SqlServer** -> 3.1.1-servicing.19610.7
  - **dotnet-ef** -> 3.1.1-servicing.19610.7
  - **Microsoft.EntityFrameworkCore** -> 3.1.1-servicing.19610.7
  - **Microsoft.EntityFrameworkCore.InMemory** -> 3.1.1-servicing.19610.7
  - **Microsoft.EntityFrameworkCore.Relational** -> 3.1.1-servicing.19610.7
  - **Microsoft.EntityFrameworkCore.Sqlite** -> 3.1.1-servicing.19610.7

[marker]: <> (End:48752c90-f78c-49ee-575f-08d76e1d56cb)
2019-12-15 17:23:03 +00:00
wtgodbe 6ce4719886 Fixup nuspecs for TargetingPackPackage/SharedFrameworkPackage 2019-12-13 16:19:53 -08:00
Doug Bunting 7ba757265f
Merge branch 'release/3.1' into merge/release/3.0-to-release/3.1
- upgrade Arcade SDK to '1.0.0-beta.19607.3'
- regenerate eng/ProjectReferences.props and ref/ projects
2019-12-11 20:03:03 -08:00
William Godbe 1f114dff50
Download runtime from suffixed location in dotnetcli blob storage (#17592) 2019-12-05 12:33:38 -08:00
William Godbe 89aae45d6d
Download runtime from suffixed location in dotnetcli blob storage (#17593) 2019-12-04 16:31:45 -08:00
Doug Bunting 4ba64f5470
Re-enable signing validation (#13899)
- #13864
- use latest Arcade from '.NET 3 Tools'
  - pick up @joeloff's #4083 signing validation fixes
- update signing validation exclusions to get them working
- remove custom embedded package icon bits and use Arcade approach
  - also switch VS.Redist.* packages to use license expressions
2019-11-19 07:14:34 -08:00
dotnet-maestro[bot] c82a95e009
[release/3.1] Update dependencies from 3 repositories (#15218)
* Update dependencies from https://github.com/dotnet/arcade build 20191017.3

- Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19517.3
- Microsoft.DotNet.GenAPI - 1.0.0-beta.19517.3
- Microsoft.DotNet.Helix.Sdk - 2.0.0-beta.19517.3

* Update dependencies from https://github.com/aspnet/EntityFrameworkCore build 20191021.2

- Microsoft.EntityFrameworkCore.Tools - 3.1.0-preview2.19521.2
- Microsoft.EntityFrameworkCore.SqlServer - 3.1.0-preview2.19521.2
- dotnet-ef - 3.1.0-preview2.19521.2
- Microsoft.EntityFrameworkCore - 3.1.0-preview2.19521.2
- Microsoft.EntityFrameworkCore.InMemory - 3.1.0-preview2.19521.2
- Microsoft.EntityFrameworkCore.Relational - 3.1.0-preview2.19521.2
- Microsoft.EntityFrameworkCore.Sqlite - 3.1.0-preview2.19521.2

* Update dependencies from https://github.com/aspnet/EntityFrameworkCore build 20191021.4

- Microsoft.EntityFrameworkCore.Tools - 3.1.0-preview2.19521.4
- Microsoft.EntityFrameworkCore.SqlServer - 3.1.0-preview2.19521.4
- dotnet-ef - 3.1.0-preview2.19521.4
- Microsoft.EntityFrameworkCore - 3.1.0-preview2.19521.4
- Microsoft.EntityFrameworkCore.InMemory - 3.1.0-preview2.19521.4
- Microsoft.EntityFrameworkCore.Relational - 3.1.0-preview2.19521.4
- Microsoft.EntityFrameworkCore.Sqlite - 3.1.0-preview2.19521.4

* Update dependencies from https://github.com/aspnet/EntityFrameworkCore build 20191021.5

- Microsoft.EntityFrameworkCore.Tools - 3.1.0-preview2.19521.5
- Microsoft.EntityFrameworkCore.SqlServer - 3.1.0-preview2.19521.5
- dotnet-ef - 3.1.0-preview2.19521.5
- Microsoft.EntityFrameworkCore - 3.1.0-preview2.19521.5
- Microsoft.EntityFrameworkCore.InMemory - 3.1.0-preview2.19521.5
- Microsoft.EntityFrameworkCore.Relational - 3.1.0-preview2.19521.5
- Microsoft.EntityFrameworkCore.Sqlite - 3.1.0-preview2.19521.5

* Update dependencies from https://github.com/aspnet/EntityFrameworkCore build 20191021.7

- Microsoft.EntityFrameworkCore.Tools - 3.1.0-preview2.19521.7
- Microsoft.EntityFrameworkCore.SqlServer - 3.1.0-preview2.19521.7
- dotnet-ef - 3.1.0-preview2.19521.7
- Microsoft.EntityFrameworkCore - 3.1.0-preview2.19521.7
- Microsoft.EntityFrameworkCore.InMemory - 3.1.0-preview2.19521.7
- Microsoft.EntityFrameworkCore.Relational - 3.1.0-preview2.19521.7
- Microsoft.EntityFrameworkCore.Sqlite - 3.1.0-preview2.19521.7

* Update dependencies from https://github.com/aspnet/EntityFrameworkCore build 20191021.8

- Microsoft.EntityFrameworkCore.Tools - 3.1.0-preview2.19521.8
- Microsoft.EntityFrameworkCore.SqlServer - 3.1.0-preview2.19521.8
- dotnet-ef - 3.1.0-preview2.19521.8
- Microsoft.EntityFrameworkCore - 3.1.0-preview2.19521.8
- Microsoft.EntityFrameworkCore.InMemory - 3.1.0-preview2.19521.8
- Microsoft.EntityFrameworkCore.Relational - 3.1.0-preview2.19521.8
- Microsoft.EntityFrameworkCore.Sqlite - 3.1.0-preview2.19521.8

* Update dependencies from https://github.com/aspnet/EntityFrameworkCore build 20191021.9

- Microsoft.EntityFrameworkCore.Tools - 3.1.0-preview2.19521.9
- Microsoft.EntityFrameworkCore.SqlServer - 3.1.0-preview2.19521.9
- dotnet-ef - 3.1.0-preview2.19521.9
- Microsoft.EntityFrameworkCore - 3.1.0-preview2.19521.9
- Microsoft.EntityFrameworkCore.InMemory - 3.1.0-preview2.19521.9
- Microsoft.EntityFrameworkCore.Relational - 3.1.0-preview2.19521.9
- Microsoft.EntityFrameworkCore.Sqlite - 3.1.0-preview2.19521.9

* Update dependencies from https://github.com/aspnet/EntityFrameworkCore build 20191021.11

- Microsoft.EntityFrameworkCore.Tools - 3.1.0-preview2.19521.11
- Microsoft.EntityFrameworkCore.SqlServer - 3.1.0-preview2.19521.11
- dotnet-ef - 3.1.0-preview2.19521.11
- Microsoft.EntityFrameworkCore - 3.1.0-preview2.19521.11
- Microsoft.EntityFrameworkCore.InMemory - 3.1.0-preview2.19521.11
- Microsoft.EntityFrameworkCore.Relational - 3.1.0-preview2.19521.11
- Microsoft.EntityFrameworkCore.Sqlite - 3.1.0-preview2.19521.11

* Update dependencies from https://github.com/aspnet/EntityFrameworkCore build 20191021.12

- Microsoft.EntityFrameworkCore.Tools - 3.1.0-preview2.19521.12
- Microsoft.EntityFrameworkCore.SqlServer - 3.1.0-preview2.19521.12
- dotnet-ef - 3.1.0-preview2.19521.12
- Microsoft.EntityFrameworkCore - 3.1.0-preview2.19521.12
- Microsoft.EntityFrameworkCore.InMemory - 3.1.0-preview2.19521.12
- Microsoft.EntityFrameworkCore.Relational - 3.1.0-preview2.19521.12
- Microsoft.EntityFrameworkCore.Sqlite - 3.1.0-preview2.19521.12

* Update dependencies from https://github.com/aspnet/EntityFrameworkCore build 20191021.13

- Microsoft.EntityFrameworkCore.Tools - 3.1.0-preview2.19521.13
- Microsoft.EntityFrameworkCore.SqlServer - 3.1.0-preview2.19521.13
- dotnet-ef - 3.1.0-preview2.19521.13
- Microsoft.EntityFrameworkCore - 3.1.0-preview2.19521.13
- Microsoft.EntityFrameworkCore.InMemory - 3.1.0-preview2.19521.13
- Microsoft.EntityFrameworkCore.Relational - 3.1.0-preview2.19521.13
- Microsoft.EntityFrameworkCore.Sqlite - 3.1.0-preview2.19521.13

* Update dependencies from https://github.com/aspnet/EntityFrameworkCore build 20191022.1

- Microsoft.EntityFrameworkCore.Tools - 3.1.0-preview2.19522.1
- Microsoft.EntityFrameworkCore.SqlServer - 3.1.0-preview2.19522.1
- dotnet-ef - 3.1.0-preview2.19522.1
- Microsoft.EntityFrameworkCore - 3.1.0-preview2.19522.1
- Microsoft.EntityFrameworkCore.InMemory - 3.1.0-preview2.19522.1
- Microsoft.EntityFrameworkCore.Relational - 3.1.0-preview2.19522.1
- Microsoft.EntityFrameworkCore.Sqlite - 3.1.0-preview2.19522.1

* Update dependencies from https://github.com/aspnet/EntityFrameworkCore build 20191022.3

- Microsoft.EntityFrameworkCore.Tools - 3.1.0-preview2.19522.3
- Microsoft.EntityFrameworkCore.SqlServer - 3.1.0-preview2.19522.3
- dotnet-ef - 3.1.0-preview2.19522.3
- Microsoft.EntityFrameworkCore - 3.1.0-preview2.19522.3
- Microsoft.EntityFrameworkCore.InMemory - 3.1.0-preview2.19522.3
- Microsoft.EntityFrameworkCore.Relational - 3.1.0-preview2.19522.3
- Microsoft.EntityFrameworkCore.Sqlite - 3.1.0-preview2.19522.3

* Remove duplicate icon url

* Remove more duplicate icon elements

* Remove more package icons

* Remove packageIcon

* Update dependencies from https://github.com/aspnet/Blazor build 20191023.1

- Microsoft.AspNetCore.Blazor.Mono - 3.1.0-preview2.19523.1

* Undo bad deletion of eng/common file
2019-10-24 00:07:47 +00:00
Doug Bunting 5db0c95c44
Merge branch 'release/3.1' into merge/release/3.0-to-release/3.1 2019-10-17 14:06:15 -07:00
Doug Bunting 0da2edb205
Re-enable Linux installer builds (#15119)
- `'$(IsTargetingPackBuilding)' == 'false'` should only disable the targeting packs on non-Windows
- disable `CreateTargetingPackNugetPackage` target on Windows
2019-10-17 13:01:57 -07:00
wtgodbe 8deeed2fa8 Merge branches 2019-10-14 13:21:58 -07:00
wtgodbe 03b4bcfee8 Test fixes for ref-pack build 2019-10-08 11:44:19 -07:00
John Luo 354d859d50
Manually add TypeForwardedTo in ref assemblies (#14538)
* Manually add TypeForwardedTo in ref assemblies

* Pin ref assembly version to Major.Minor.0.0

* Disable MSB3243 warning

* Pin pinning implementation assembly version

* Use nuget.exe v5.3.0 which support icon metadata

* Fixup nuspec packing
2019-10-07 21:00:34 -07:00
wtgodbe 86e9b45aa0 Use up-to-date nuget versions 2019-09-26 12:53:59 -07:00
wtgodbe 8c49f8937d Add icon metadata to manually generated .nuspecs 2019-09-24 13:31:51 -07:00
wtgodbe ff61a43031 Merge branches 2019-09-24 13:26:49 -07:00
Justin Kotalik 28b66b1dbd
Make ANCM Msis include version in name (#13968)
* Make ANCM Msis include version

* Update AncmIISExpressV2.wixproj

* Update AncmV2.wixproj

* Try doing fancy stuff

* Trying to change PackageFileName instead
2019-09-20 04:00:24 +09:00
Doug Bunting 07a2311413
Do not attempt include CAP in framework package
- sfx_x??.cab files are now embedded in aspnetcore-runtime-3.1.0-ci-win-x??.msi files
- no need for same content to appear separately in VS.Redist.Common.AspNetCore.SharedFramework.x??.3.1.3.1.0-ci.nupkg
2019-09-16 18:40:15 -07:00
Doug Bunting 5be5717d5e
Merge branch 'release/3.0' into 'release/3.1' 2019-09-16 16:32:42 -07:00
Doug Bunting aee5e40803 Stabilize package versions (#14003)
* Mark all blobs as shipping
- available (though not discoverable) in public dotnetcli feed

* Stabilize package versions

* Remove assumption that Microsoft.AspNetCore.AzureAppServices.SiteExtension packages have same version
- Microsoft.AspNetCore.AzureAppServices.SiteExtension.3.0 ships
- Microsoft.AspNetCore.AzureAppServices.SiteExtension.3.0.x?? do not ship

* Make installer versions consistent
- VS.Redist.Common.AspNetCore.SharedFramework and ...TargetingPack packages are non-shipping
- everything else ships

nit: remove extra whitespace in .nuspec files for the packages

* Correct assumptions in framework unit tests
- tests sometimes do not calculate version properties as product projects do
- Microsoft.AspNetCore.App.Ref and ...Runtime packages may rev versions separately

* Fix last 2 `SharedFxTests` failures

* Correct Microsoft.AspNetCore.App* versions used in ProjectTemplates tests
- `$(SharedFxVersion)` is not useful in test projects due to stable versioning

* Add continue on error for test templates
2019-09-15 13:34:08 -07:00
Jacques Eloff 262f29b0ec Embed CAB files #13875 2019-09-10 15:42:19 -07:00
Justin Kotalik 8cbc76f1ec Merge remote-tracking branch 'origin/release/2.2' 2019-07-25 11:41:11 -07:00
Justin Kotalik 9a6d4af9d6 Merge release/2.1 into release/2.2 (#12290) 2019-07-24 18:01:57 -07:00
John Luo 99ee868090
Resolve Guid inputs correctly (#11865) 2019-07-05 09:46:26 -07:00
John Luo ef19361731
Ensure builds have unique package GUIDs (#11703) 2019-06-28 21:47:44 -07:00
Jacques Eloff c3e88a8732 Update FWLINK to point to latest EULA 2019-06-27 14:34:54 -07:00
Justin Kotalik 185d28925e
Actually use correct versions in VS Insertion Packages (#11615) 2019-06-27 10:14:53 -07:00