Commit Graph

155 Commits

Author SHA1 Message Date
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
Brennan Conroy 2d066dcd3e Apply some fixes 2020-02-19 14:18:29 -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
William Godbe 22dedcb2f0 Use M.NC.App RefPack version for dotnet targeting pack dependency version (#16832) 2019-11-04 16:09:29 -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 d7faa8fc48 Disable RPMBuild if not building RefPack, fix template test RefPack version 2019-10-10 14:17:15 -07:00
wtgodbe a071e40e34 Disable DebBuild when we're not building targetingPack 2019-10-10 13:41:07 -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
Justin Kotalik 0274aceaee
Generate .nupkg files that contain aspnetcore-runtime MSI for insertion into Visual Studio (#11345) 2019-06-25 13:41:16 -07:00
Jacques Eloff 67e6351e6a Tweak UI layout for non-ENU installs 2019-06-21 09:56:03 -07:00
Nate McMaster 4fde84a7ad Replace KoreBuild with Arcade (#11122)
* Replace usages of $(CI) with $(ContinuousIntegrationBuild)

* Move RepoTasks to eng/tools/

* Remove dead code

* Update build.sh/ps1 to invoke Arcade instead of KoreBuild

* build/repo.props => eng/Build.props

* build/CodeSign.{props,targets} => eng/Signing.props

* build/repo.targets => eng/Build.props, eng/CodeGen.proj, and eng/AfterSolutionBuild.targets

* Remove AddAllProjectRefsToSolution.ps1

* Put selenium process tracking into artifacts/tmp/

* build/docker => eng/docker

* Move content from korebuild.json to global.json

* Remove cibuild.{sh,cmd} and update ci.yml

* Ensure vswhere detects BuildTools installations

* Remove sign check exclusions (Arcade does not support)

* list VS required components in global.json

* Update CodeCheck.ps1

* Update arcade (#11143)

* Fixups to broken build

* capture test results in xunit form
* attempt to fix code check
* restore before linux build
* remove duplicate signinfos

* More build fixes

* exclude node_modules from unique project check
* fixup signing props

* More build fixes

* Remove unused NoWarns
* Skip building site extension
* Suppress xunit color in console output
* Install x86 runtime

* Run KillProcesses.ps1 at end of build on CI

* activate env vars in codecheck.ps1

* Fix signing and generate build manifests

* Fixup code check and linux installers build

* Remove custom restore targets

* Import flaky test props

* Restore original manifest generation code and set warnAsErrors=false

* Alwasy restore the toolset

* More attempts at build fixes

* run restore before building deb/rpm packages
* pre-install Yarn.MSBuild
* Remove WIX workaround

* Attempt to fix RPM installers and x86 build

* Fix helix tests, java auto-detection, and code gen steps

* Globally disable MSBuild node resuse and capture MSbuild crash logs

* Cleanup build invocation for installers

* Set max time on xunit tests to 15 min

* Update helix-test.yml

* Fix Hosting tests

* Fix TestHost

* Fix Negotiate.Test

* Fix Mvc tests

* Capture results

* Fix Hosting tests

* Fix Kestrel tests

* Fix ServerComparison tests

* Fix DefaultBuilder functional tests

* Skip template tests

Need to run pack before running tests on mac/linux now

* Fix Identity test

* Fix ServerComparison tests

* Verify nginx installation on ubuntu

* Verify nginx installation?

* Try adding to path

* Try symlink

* Sudo?

* Woot it works

* Disable timeout

Template tests require more than 15 mins

* list env vars

* Use correct dotnet_home

* Prepent path instead

* Fix npmproj tests

* Fix CORS tests

* Debug signalr tests

* Debug signalr

* Capture bin

* Try building templates sequentially

* Debug signalr

* Cleanup

* Disable signalr npm tests

* Debug template test

* Try to fix templates again and make steps more reliable

* Cleanup

* Feedback
2019-06-19 10:03:38 -07:00
Justin Kotalik 14e7aca2ed
React to changes in Microsoft.NETCore.App (#11153) 2019-06-12 17:51:40 -07:00
Jacques Eloff 147f5afb1e Re-enable setup localization (#11094) 2019-06-11 09:21:06 -07:00
Jacques Eloff 85feca7a12
Merge pull request #10932 from aspnet/joeloff/LocUpdate
Localization handback for missing strings
2019-06-11 07:43:40 -07:00
Nate McMaster 41ce223c1c
Replace Internal.AspNetCore.Sdk with Microsoft.DotNet.Arcade.Sdk (#10674)
* Update build.cmd to install .NET Core into $repoRoot/.dotnet instead of $repoRoot/.dotnet/x64
* Move restore sources from build/sources.props into eng/Versions.props (following arcade conventions)
* Remove usages of RuntimeFrameworkVersion in tests and build
* Update Blazor VSIX to use Arcade VSIX tools
* Rename Common.Tests to IIS.Common.TestLib and make it a test asset
* Remove custom versions props for ANCM installer code
* Remove duplicate references to xunit and remove usages of IsTestProject
* Remove duplicate references to Internal.AspNetCore.Analyzers
* Import Arcade.Sdk props and targets and remove custom versioning props
* Remove references to Internal.AspNetCore.Sdk
* Rename PackageLicenseType => PackageLicenseExpression
* Remove dependency on tasks in Internal.AspNetCore.Sdk, add ref to Internal.AspNetCore.BuildTasks as a temporary workaround
* Use Arcade's nuspec support
* Rename SignalR.Client.FunctionalTests to SignalR.Client.FunctionalTestApp
* Fixes for changes to property evaluation order
* Update BaseLineGenerator to netcoreapp3.0
* React to changes in evaluation order in RPM files and quirks in using <Exec> instead of <Run>
* Update Microsoft.Extensions.ApiDescription.Server to react to changes in Arcade packaging
* Workaround aspnet/AspNetCore#11009
2019-06-07 17:19:41 -07:00
Nate McMaster 4300f498c7
[automated] Merge branch 'release/3.0-preview6' => 'master' (#10936) 2019-06-07 11:21:00 -07:00