huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
41,106 Commits 1 Branch 0 Tags 251 MiB
Commit Graph

120 Commits

Author SHA1 Message Date
Stephen Halter 88073f86ff Merge branch 'release/3.1' into master 2020-02-18 13:46:51 -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
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
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
Jacques Eloff c5f85986e6 Disable bundle localization (#10976) 2019-06-07 09:54:59 -07:00
Andrew Stanton-Nurse 915cc74df8 fix #7548 by updating to v142 toolset (again) (#10904) 
* fix #7548 by updating to v142 toolset (again)

* small note

* it's a compiler bug. let's just try

* you get a pass vc++... THIS TIME

* should no longer need v141 toolset!
 2019-06-05 21:31:36 -07:00
Jacques Eloff 5af0dd5b38 Localization handback for missing strings 2019-06-05 15:38:34 -07:00
Kevin Pilch f1ff37efdb
Clean up some stale comments (#10561) 
Addresses AzDO Bug #890301 (https://dev.azure.com/devdiv/DevDiv/_workitems/edit/890301/)
 2019-05-28 17:24:11 -07:00
Jacques Eloff eebd61642f
Merge pull request #10296 from aspnet/joeloff/LocLink 
Fix .wxl reference
 2019-05-23 09:05:04 -07:00
Doug Bunting 5502c2080e Fix sign check 
- most likely cause of failing official builds
- small typo in #10340: need to find .cab files _below_ `$(TargetDir)`
 2019-05-18 19:00:04 -07:00
Jacques Eloff fa2cad3452 CopyCabs 2019-05-17 12:15:20 -07:00
John Luo 818dc3b74a
Update log directory (#10301) 
* Update log directory

This will now include functional test logs

* There were a few more places logs was used instead of log
 2019-05-17 09:02:34 -07:00
Nate McMaster 117dd8cff4
Use Arcade version suffixes for local (3.0.0-dev) and PR builds (3.0.0-ci) (#10279) 
* Update versioning for local and PR builds to match Arcade versioning
* Mark CanCancelIAsyncEnumerableClientToServerUpload as flaky - cref aspnet/AspNetCore-Internal#2465
* Disable rollforward in project template tests (3.0.0-dev is older than 3.0.0-preview*). This prevents tests from rolling forward onto technically older bits
 2019-05-16 12:59:40 -07:00
Jacques Eloff d83bb8efa2
Merge pull request #10241 from aspnet/joeloff/SetupAssets 
Publish the shared framework MSI to artifacts
 2019-05-16 10:56:38 -07:00
Jacques Eloff 75dcbf3f98 Fix .wxl reference 2019-05-16 10:32:37 -07:00
Nate McMaster dc90e11c7a
Move obj and bin directories into repo root (#10063) 
The Arcade SDK requires that the obj/ and bin/ folders be placed in the top-level artifacts/ folder of the repo. Although this PR does not complete our Arcade convergence, this is a step towards updating our repo to build with the Arcade SDK.

Changes:
* Set output path for build to artifacts/bin/$(ProjectName)/ 
* Set intermediate output path for build to artifacts/obj/$(ProjectName)/
* Cleanup .gitignore files (remove duplication between repo-root and tested gitignore files)
* Add code check which looks for project files that share the same name (could cause issues)
* Rename project files to have unique names (avoid race condition of build output)
* Update all locations which were hard-coded to expect bin/ and obj/ in the project directory
* Add overrides for tests which still assert test binaries exist in a given location relative to the source code
 2019-05-15 13:44:55 -07:00
Nate McMaster 77e08c26d5
Replace all usages of RepositoryRoot with RepoRoot (#10267) 
Preparing to adopt the Arcade SDK, which uses the shorter variable name instead
 2019-05-15 12:00:19 -07:00