Commit graph

3477 commits

Author SHA1 Message Date
dotnet-maestro[bot]
61dd7339c7
[master] Update dependencies from aspnet/AspNetCore (#4391)
* Update dependencies from https://github.com/aspnet/AspNetCore build 20190828.12

- Microsoft.AspNetCore.DeveloperCertificates.XPlat - 5.0.0-alpha1.19428.12
- Microsoft.AspNetCore.App.Runtime.win-x64 - 5.0.0-alpha1.19428.12
- Microsoft.AspNetCore.App.Ref - 5.0.0-alpha1.19428.12
- dotnet-watch - 5.0.0-alpha1.19428.12
- dotnet-user-secrets - 5.0.0-alpha1.19428.12
- dotnet-dev-certs - 5.0.0-alpha1.19428.12

* Update dependencies from https://github.com/aspnet/AspNetCore build 20190830.9

- Microsoft.AspNetCore.DeveloperCertificates.XPlat - 5.0.0-alpha1.19430.9
- Microsoft.AspNetCore.App.Runtime.win-x64 - 5.0.0-alpha1.19430.9
- Microsoft.AspNetCore.App.Ref - 5.0.0-alpha1.19430.9
- dotnet-watch - 5.0.0-alpha1.19430.9
- dotnet-user-secrets - 5.0.0-alpha1.19430.9
- dotnet-dev-certs - 5.0.0-alpha1.19430.9

* Update dependencies from https://github.com/aspnet/AspNetCore build 20190903.5

- Microsoft.AspNetCore.DeveloperCertificates.XPlat - 5.0.0-alpha1.19453.5
- Microsoft.AspNetCore.App.Runtime.win-x64 - 5.0.0-alpha1.19453.5
- Microsoft.AspNetCore.App.Ref - 5.0.0-alpha1.19453.5
- dotnet-watch - 5.0.0-alpha1.19453.5
- dotnet-user-secrets - 5.0.0-alpha1.19453.5
- dotnet-dev-certs - 5.0.0-alpha1.19453.5

* Update dependencies from https://github.com/aspnet/AspNetCore build 20190903.8

- Microsoft.AspNetCore.DeveloperCertificates.XPlat - 5.0.0-alpha1.19453.8
- Microsoft.AspNetCore.App.Runtime.win-x64 - 5.0.0-alpha1.19453.8
- Microsoft.AspNetCore.App.Ref - 5.0.0-alpha1.19453.8
- dotnet-watch - 5.0.0-alpha1.19453.8
- dotnet-user-secrets - 5.0.0-alpha1.19453.8
- dotnet-dev-certs - 5.0.0-alpha1.19453.8

* Update dependencies from https://github.com/aspnet/AspNetCore build 20190904.6

- Microsoft.AspNetCore.DeveloperCertificates.XPlat - 5.0.0-alpha1.19454.6
- Microsoft.AspNetCore.App.Runtime.win-x64 - 5.0.0-alpha1.19454.6
- Microsoft.AspNetCore.App.Ref - 5.0.0-alpha1.19454.6
- dotnet-watch - 5.0.0-alpha1.19454.6
- dotnet-user-secrets - 5.0.0-alpha1.19454.6
- dotnet-dev-certs - 5.0.0-alpha1.19454.6

* Update dependencies from https://github.com/aspnet/AspNetCore build 20190904.9

- Microsoft.AspNetCore.DeveloperCertificates.XPlat - 5.0.0-alpha1.19454.9
- Microsoft.AspNetCore.App.Runtime.win-x64 - 5.0.0-alpha1.19454.9
- Microsoft.AspNetCore.App.Ref - 5.0.0-alpha1.19454.9
- dotnet-watch - 5.0.0-alpha1.19454.9
- dotnet-user-secrets - 5.0.0-alpha1.19454.9
- dotnet-dev-certs - 5.0.0-alpha1.19454.9

* Update dependencies from https://github.com/aspnet/AspNetCore build 20190906.3

- Microsoft.AspNetCore.DeveloperCertificates.XPlat - 5.0.0-alpha1.19456.3
- Microsoft.AspNetCore.App.Runtime.win-x64 - 5.0.0-alpha1.19456.3
- Microsoft.AspNetCore.App.Ref - 5.0.0-alpha1.19456.3
- dotnet-watch - 5.0.0-alpha1.19456.3
- dotnet-user-secrets - 5.0.0-alpha1.19456.3
- dotnet-dev-certs - 5.0.0-alpha1.19456.3

* Update dependencies from https://github.com/aspnet/AspNetCore build 20190909.1

- Microsoft.AspNetCore.DeveloperCertificates.XPlat - 5.0.0-alpha1.19459.1
- Microsoft.AspNetCore.App.Runtime.win-x64 - 5.0.0-alpha1.19459.1
- Microsoft.AspNetCore.App.Ref - 5.0.0-alpha1.19459.1
- dotnet-watch - 5.0.0-alpha1.19459.1
- dotnet-user-secrets - 5.0.0-alpha1.19459.1
- dotnet-dev-certs - 5.0.0-alpha1.19459.1

* Update 3.0 versions to rc1, update TargetFramework for ASP.NET framework reference

* Update dependencies from https://github.com/aspnet/AspNetCore build 20190909.4

- Microsoft.AspNetCore.DeveloperCertificates.XPlat - 5.0.0-alpha1.19459.4
- Microsoft.AspNetCore.App.Runtime.win-x64 - 5.0.0-alpha1.19459.4
- Microsoft.AspNetCore.App.Ref - 5.0.0-alpha1.19459.4
- dotnet-watch - 5.0.0-alpha1.19459.4
- dotnet-user-secrets - 5.0.0-alpha1.19459.4
- dotnet-dev-certs - 5.0.0-alpha1.19459.4

* Update dependencies from https://github.com/aspnet/AspNetCore build 20190911.3

- Microsoft.AspNetCore.DeveloperCertificates.XPlat - 5.0.0-alpha1.19461.3
- Microsoft.AspNetCore.App.Runtime.win-x64 - 5.0.0-alpha1.19461.3
- Microsoft.AspNetCore.App.Ref - 5.0.0-alpha1.19461.3
- dotnet-watch - 5.0.0-alpha1.19461.3
- dotnet-user-secrets - 5.0.0-alpha1.19461.3
- dotnet-dev-certs - 5.0.0-alpha1.19461.3

* Update dependencies from https://github.com/aspnet/AspNetCore build 20190911.5

- Microsoft.AspNetCore.DeveloperCertificates.XPlat - 5.0.0-alpha1.19461.5
- Microsoft.AspNetCore.App.Runtime.win-x64 - 5.0.0-alpha1.19461.5
- Microsoft.AspNetCore.App.Ref - 5.0.0-alpha1.19461.5
- dotnet-watch - 5.0.0-alpha1.19461.5
- dotnet-user-secrets - 5.0.0-alpha1.19461.5
- dotnet-dev-certs - 5.0.0-alpha1.19461.5

* Update dependencies from https://github.com/aspnet/AspNetCore build 20190911.8

- Microsoft.AspNetCore.DeveloperCertificates.XPlat - 5.0.0-alpha1.19461.8
- Microsoft.AspNetCore.App.Runtime.win-x64 - 5.0.0-alpha1.19461.8
- Microsoft.AspNetCore.App.Ref - 5.0.0-alpha1.19461.8
- dotnet-watch - 5.0.0-alpha1.19461.8
- dotnet-user-secrets - 5.0.0-alpha1.19461.8
- dotnet-dev-certs - 5.0.0-alpha1.19461.8

* Update dependencies from https://github.com/aspnet/AspNetCore build 20190911.11

- Microsoft.AspNetCore.DeveloperCertificates.XPlat - 5.0.0-alpha1.19461.11
- Microsoft.AspNetCore.App.Runtime.win-x64 - 5.0.0-alpha1.19461.11
- Microsoft.AspNetCore.App.Ref - 5.0.0-alpha1.19461.11
- dotnet-watch - 5.0.0-alpha1.19461.11
- dotnet-user-secrets - 5.0.0-alpha1.19461.11
- dotnet-dev-certs - 5.0.0-alpha1.19461.11

* Update dependencies from https://github.com/aspnet/AspNetCore build 20190911.13

- Microsoft.AspNetCore.DeveloperCertificates.XPlat - 5.0.0-alpha1.19461.13
- Microsoft.AspNetCore.App.Runtime.win-x64 - 5.0.0-alpha1.19461.13
- Microsoft.AspNetCore.App.Ref - 5.0.0-alpha1.19461.13
- dotnet-watch - 5.0.0-alpha1.19461.13
- dotnet-user-secrets - 5.0.0-alpha1.19461.13
- dotnet-dev-certs - 5.0.0-alpha1.19461.13

* Update dependencies from https://github.com/aspnet/AspNetCore build 20190912.1

- Microsoft.AspNetCore.DeveloperCertificates.XPlat - 5.0.0-alpha1.19462.1
- Microsoft.AspNetCore.App.Runtime.win-x64 - 5.0.0-alpha1.19462.1
- Microsoft.AspNetCore.App.Ref - 5.0.0-alpha1.19462.1
- dotnet-watch - 5.0.0-alpha1.19462.1
- dotnet-user-secrets - 5.0.0-alpha1.19462.1
- dotnet-dev-certs - 5.0.0-alpha1.19462.1

* Update dependencies from https://github.com/aspnet/AspNetCore build 20190912.5

- Microsoft.AspNetCore.DeveloperCertificates.XPlat - 5.0.0-alpha1.19462.5
- Microsoft.AspNetCore.App.Runtime.win-x64 - 5.0.0-alpha1.19462.5
- Microsoft.AspNetCore.App.Ref - 5.0.0-alpha1.19462.5
- dotnet-watch - 5.0.0-alpha1.19462.5
- dotnet-user-secrets - 5.0.0-alpha1.19462.5
- dotnet-dev-certs - 5.0.0-alpha1.19462.5

* Update dependencies from https://github.com/aspnet/AspNetCore build 20190912.9

- Microsoft.AspNetCore.DeveloperCertificates.XPlat - 5.0.0-alpha1.19462.9
- Microsoft.AspNetCore.App.Runtime.win-x64 - 5.0.0-alpha1.19462.9
- Microsoft.AspNetCore.App.Ref - 5.0.0-alpha1.19462.9
- dotnet-watch - 5.0.0-alpha1.19462.9
- dotnet-user-secrets - 5.0.0-alpha1.19462.9
- dotnet-dev-certs - 5.0.0-alpha1.19462.9

* Update dependencies from https://github.com/aspnet/AspNetCore build 20190916.1

- Microsoft.AspNetCore.DeveloperCertificates.XPlat - 5.0.0-alpha1.19466.1
- Microsoft.AspNetCore.App.Runtime.win-x64 - 5.0.0-alpha1.19466.1
- Microsoft.AspNetCore.App.Ref - 5.0.0-alpha1.19466.1
- dotnet-watch - 5.0.0-alpha1.19466.1
- dotnet-user-secrets - 5.0.0-alpha1.19466.1
- dotnet-dev-certs - 5.0.0-alpha1.19466.1

* Update dependencies from https://github.com/aspnet/AspNetCore build 20190916.2

- Microsoft.AspNetCore.DeveloperCertificates.XPlat - 5.0.0-alpha1.19466.2
- Microsoft.AspNetCore.App.Runtime.win-x64 - 5.0.0-alpha1.19466.2
- Microsoft.AspNetCore.App.Ref - 5.0.0-alpha1.19466.2
- dotnet-watch - 5.0.0-alpha1.19466.2
- dotnet-user-secrets - 5.0.0-alpha1.19466.2
- dotnet-dev-certs - 5.0.0-alpha1.19466.2

* Update dependencies from https://github.com/aspnet/AspNetCore build 20190916.4

- Microsoft.AspNetCore.DeveloperCertificates.XPlat - 5.0.0-alpha1.19466.4
- Microsoft.AspNetCore.App.Runtime.win-x64 - 5.0.0-alpha1.19466.4
- Microsoft.AspNetCore.App.Ref - 5.0.0-alpha1.19466.4
- dotnet-watch - 5.0.0-alpha1.19466.4
- dotnet-user-secrets - 5.0.0-alpha1.19466.4
- dotnet-dev-certs - 5.0.0-alpha1.19466.4

* Update dependencies from https://github.com/aspnet/AspNetCore build 20190916.5

- Microsoft.AspNetCore.DeveloperCertificates.XPlat - 5.0.0-alpha1.19466.5
- Microsoft.AspNetCore.App.Runtime.win-x64 - 5.0.0-alpha1.19466.5
- Microsoft.AspNetCore.App.Ref - 5.0.0-alpha1.19466.5
- dotnet-watch - 5.0.0-alpha1.19466.5
- dotnet-user-secrets - 5.0.0-alpha1.19466.5
- dotnet-dev-certs - 5.0.0-alpha1.19466.5

* Update dependencies from https://github.com/aspnet/AspNetCore build 20190916.7

- Microsoft.AspNetCore.DeveloperCertificates.XPlat - 5.0.0-alpha1.19466.7
- Microsoft.AspNetCore.App.Runtime.win-x64 - 5.0.0-alpha1.19466.7
- Microsoft.AspNetCore.App.Ref - 5.0.0-alpha1.19466.7
- dotnet-watch - 5.0.0-alpha1.19466.7
- dotnet-user-secrets - 5.0.0-alpha1.19466.7
- dotnet-dev-certs - 5.0.0-alpha1.19466.7

* Support targeting ASP.NET Core 5.0
2019-09-17 20:09:37 +00:00
Livar
0714086bdf
Fixing the channel for the master branch. 2019-09-11 14:48:13 -07:00
Livar Cunha
0fa63a5fef Re-doing the merge of GenerateBundledVersion.targets. 2019-09-11 10:33:24 -07:00
Livar Cunha
5421af4ad6 Merge remote-tracking branch 'upstream/release/3.1.1xx' into merges/release/3.1.1xx-to-master
* upstream/release/3.1.1xx: (422 commits)
  Update dependencies from https://github.com/dotnet/toolset build 20190911.12 (#4733)
  Update dependencies from https://github.com/dotnet/toolset build 20190911.11 (#4731)
  Update dependencies from https://github.com/aspnet/AspNetCore build 20190911.1 (#4729)
  [release/3.1.1xx] Update dependencies from dotnet/toolset (#4211)
  Update dependencies from https://github.com/dotnet/arcade build 20190910.3 (#4728)
  Exclude ASP.NET targeting pack and shared framework from RPM/debs until we have 3.1 versions
  Add support for targeting .NET Core 3.1
  Update latest patch versions
  Update dependencies from https://github.com/dotnet/arcade build 20190909.10 (#4716)
  Do not download for 'arm*'
  Formatting...
  Download the ASP.NET SharedFramework MSI and the Module V2 MSI
  Update dependencies from https://github.com/dotnet/arcade build 20190908.2 (#4695)
  Update dependencies from https://github.com/dotnet/core-setup build 20190908.7
  Add release/3.1.xx download to readme (#4618)
  Update dependencies from https://github.com/dotnet/core-setup build 20190908.3
  Update dependencies from https://github.com/dotnet/arcade build 20190907.1 (#4667)
  Update dependencies from https://github.com/dotnet/core-setup build 20190907.10
  Update dependencies from https://github.com/dotnet/arcade build 20190906.10 (#4643)
  Update dependencies from https://github.com/dotnet/core-setup build 20190907.3
  ...

Conflicts:
README.md
eng/Version.Details.xml
eng/Versions.props
eng/common/native/install-cmake-test.sh
global.json
src/redist/targets/GenerateBundledVersions.targets
src/redist/targets/Versions.targets
2019-09-11 10:09:32 -07:00
Daniel Plaisted
ce3db2423f
Merge pull request #4721 from dsplaisted/support-3.1
Support targeting .NET Core 3.1
2019-09-10 16:04:06 -07:00
Daniel Plaisted
61d7005440 Exclude ASP.NET targeting pack and shared framework from RPM/debs until we have 3.1 versions 2019-09-10 15:03:12 -07:00
Daniel Plaisted
827464d908 Add support for targeting .NET Core 3.1 2019-09-10 13:58:14 -07:00
Daniel Plaisted
724015cc60 Update latest patch versions 2019-09-10 13:53:43 -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
0c67172baf Updates for 3.1.1xx 2019-09-03 14:33:11 -07:00
William Li
f1c62d315e Correct branding 2019-08-23 13:41:03 -07:00
William Li
032926e8fc 3.1.1xx branding 2019-08-21 18:51:43 -07:00
Livar
b830442d62
Updating release/3.0.1xx branding to rc1. 2019-08-20 14:07:50 -07:00
John Beisner
fd4ebe6d48
Merge pull request #4069 from johnbeisner/VS-ARP-PlaceHolder
SDK ARP Placeholder for Visual Studio
2019-08-19 17:23:34 -07:00
jbeisner
daee0c40db Updates per code review. 2019-08-19 11:15:40 -07:00
jbeisner
c3ae4a64a8 Updates per code review. 2019-08-16 21:54:47 +00:00
jbeisner
9fe66e5c0f Adding 'ARPNOREPAIR' 2019-08-16 19:24:07 +00:00
jbeisner
e367a32ce4 Introducing a SDK ARP Placeholder for Visual Studio 2019-08-16 18:56:20 +00:00
Zbyněk Sailer
3c07d89244 LOC CHECKIN | dotnet/core-sdk master | 20190813 (#3982) 2019-08-15 10:17:08 -07:00
jbeisner
2d53cf29ec Removing the RelativeLayoutPath: "shared" for the WinForms and Wpf ArchiveFile 2019-08-09 12:10:43 -07:00
jbeisner
f797953741 Removing the RelativeLayoutPath: "shared" for the WinForms and Wpf ArchiveFile 2019-08-09 12:10:40 -07:00
Nick Guerrera
c37db568fe
Remove unused variables from bundled versions (#3742)
These are replaced by the ImplicitPackageReferenceVersion items, and were mostly removed from 2.x:  

4158f5e94f
2019-08-09 09:09:39 -07:00
jbeisner
c820b75ae8 Fixing a typo... 2019-08-08 12:37:16 -07:00
jbeisner
562adf13ea Updating the .NET Core installer welcome message. 2019-08-08 08:50:50 -07:00
Nick Guerrera
aca24e4ecb Fix RHEL test failure 2019-08-07 13:02:21 -07:00
jbeisner
a489af6341 Updating link; "Core" change to ".NET Core" 2019-08-06 09:12:39 -07:00
Nick Guerrera
81100b05d2 Use *.5.0 template packages 2019-08-05 15:12:49 -07:00
Nick Guerrera
ac2000cc03 Add netcoreapp5.0 support to bundled versions
* Use 3.0-preview7 when targeting netcoreapp3.0 with 5.0 SDK for now
* Update known app host packs and framework references to 5.0
* Remove workaround for fixed bug from tests
* Temporarily expect run failure while templates are still at 3.0
2019-08-02 22:19:00 -07:00
John Beisner
15fcfc5c6f
Merge pull request #3624 from johnbeisner/TemplateNupkgVersioning
Standardize 2.1/2.2/3.0 templates NuPkg version
2019-07-31 08:06:19 -07:00
Daniel Plaisted
c5a57d5805
Merge pull request #3576 from dsplaisted/crossgen-sdktasks
Fix crossgen for SDK tasks and native image symbol publishing
2019-07-30 18:09:46 -07:00
jbeisner
648c78a01e Use the SDK version as the NuPkg version for templates; remove superfluous WiX logic in the templates' MSI 2019-07-30 21:50:31 +00:00
Daniel Plaisted
446a3dc389 Change directory for native PDBs, so arcade should pick them up for publishing 2019-07-29 18:14:22 -07:00
Daniel Plaisted
3435d946ed Fix crossgen'ing .NET SDK build tasks 2019-07-29 18:13:54 -07:00
Livar
21de391bc1
Updating branding to preview9 2019-07-29 10:33:54 -07:00
Livar
67910f5e07
Updating branding to 5.0.100-alpha1 2019-07-28 12:06:50 -07:00
Livar Cunha
a138255f58 Keep the latest channel as release/3.0.1xx. 2019-07-28 12:04:40 -07:00
Livar Cunha
4083b9eda1 Updating GenerateMSBuildExtensionsSWR to match what we actually insert into VS. 2019-07-26 10:38:38 -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
75e5139fe1 Merging master and resolving conflicts. 2019-07-24 16:14:47 +00:00
jbeisner
67c7c446f9 Updates per code review 2019-07-24 16:08:11 +00:00
jbeisner
249af0f120 Updates per code review. 2019-07-24 03:32:47 +00:00
Daniel Plaisted
5a590771e5
Merge pull request #2970 from dsplaisted/remove-legacyframeworkpackages
Remove PackagesToReference metadata from Microsoft.NETCore.App KnownFrameworkReference
2019-07-23 18:58:27 -07:00
jbeisner
b95848906a Fixing the 3.0 template conditional; adding a comment. 2019-07-24 00:41:46 +00:00
jbeisner
aacd4f6179 Updating 3.0 template variables. 2019-07-24 00:18:21 +00:00
jbeisner
14ef11f030 Formatting... 2019-07-22 22:31:48 +00:00
jbeisner
f31451cbc0 Minor updates to variable names 2019-07-22 22:26:51 +00:00
jbeisner
f55ddb8a15 Adding 2.1 and 2.2 Templates MSIs, part 3 2019-07-22 17:06:16 +00:00