Commit graph

791 commits

Author SHA1 Message Date
Livar
4c5978dad9 Merge pull request #6532 from mlorbetske/dev/mlorbe/UpdateTemplatesTo222
Update templates to 222
2017-05-05 21:43:36 -07:00
Mike Lorbetske
546c29361c Fix date on package version 2017-05-05 20:28:03 -07:00
Mike Lorbetske
a44e52abb3 Update templates to 222 2017-05-05 20:09:27 -07:00
Mike Lorbetske
f0e8a4f21b Update SetupCrossgen to build 82 2017-05-05 18:34:47 -07:00
Mike Lorbetske
f403c6a836 Update SetupCrossgen to build 80 2017-05-05 17:43:18 -07:00
Mike Lorbetske
835fe1dba0 Update SetupCrossgen to build 77 2017-05-05 17:29:29 -07:00
Nick Guerrera
fe14c72226 Update dotnet/sdk version 2017-05-05 17:08:57 -07:00
Christopher Costa
9e9f17a3e2 Reset platformabstraction and dependencymodel versions while issue is
being investigated
2017-05-05 17:05:35 -07:00
Nick Guerrera
ee16de3f7b Fix bad merges 2017-05-05 16:38:10 -07:00
Nick Guerrera
071789b33f Merge branch 'release/2.0.0' into merge-release-2.0 2017-05-05 16:21:15 -07:00
Christopher Costa
acc3d012ac Testing version 25305-19 2017-05-05 13:29:38 -07:00
Mike Lorbetske
17f522e66c Update to no-timestamp packages and adjust feeds and cache accordingly 2017-05-05 01:44:24 -07:00
dotnet-bot
d075a8ec6e Update CoreSetup to preview1-002111 2017-05-05 02:49:39 +00:00
Livar
20a66270e4 Merge pull request #6520 from dsplaisted/livarcocc-update_sdk
Updating the SDK to include the implicit package downgrade warnings fix.
2017-05-04 19:13:30 -07:00
Daniel Plaisted
755a91a05e Update to SDK with fix for design time evaluation 2017-05-04 18:12:14 -07:00
Livar
356e309f17 Merge pull request #6512 from mlorbetske/dev/mlorbe/UpdateToCache65
Update to ASP.NET 24840 packages/Archive 65
2017-05-04 11:26:39 -07:00
Mike Lorbetske
6b864cfead Update to ASP.NET 24840 packages/Archive 65, switch to timestamped cache packages, make clearly configurable 2017-05-03 21:44:39 -07:00
Livar Cunha
4a3c499b98 Updating the SDK to include the implicit package downgrade warnings fix. 2017-05-03 21:02:21 -07:00
Livar Cunha
9c796bbe6b Refactoring shared item groups between deb and pkg to the same location. 2017-05-03 17:55:34 -07:00
Livar Cunha
1736c388b0 Adding the Asp.Net runtime package store to the SDK pkg for now, since we don't have a separate PKG for it being produced. 2017-05-03 17:38:06 -07:00
William Li
3e42e8233b Add asp.net runtime to SDK deb package
Copy the runtime file to the deb layout folder, the deb tool picks it up
from there
2017-05-03 23:42:06 +00:00
William Li
c9295d1df7 Run dotnet new after install to prime cache for deb
Copy postinst to correct directory

Can only rely on env for get dotnet command

Print telemetry notice anyway
2017-05-03 14:10:30 -07:00
Livar
52e3ad7f9a Merge pull request #6487 from mlorbetske/dev/mlorbe/UpdateAspNetTo24801
Update ASP.NET to 24801 - SetupCrossgen build 56
2017-05-03 11:29:40 -07:00
Faizan2304
b90b191ef0 Insert Microsoft.TestPlatform.cli for update3 preview1 (#6420)
* Fix test issue failing with PathTooLongIssue

(cherry picked from commit 340254f7742201c74ed1a5c349bdca89113bd5dc)

* fix for issues:
1) https://github.com/Microsoft/vstest/issues/755
2) https://github.com/Microsoft/vstest/issues/687
3) https://github.com/Microsoft/vstest/issues/737

(cherry picked from commit 0e93b2a5d4734637538781fa5401ed81a31eea0f)

* use new version

* Update version

* Fix pathtoolong issue

* Fix test
2017-05-02 21:30:51 -07:00
Livar
a551ae77b0 Merge pull request #6460 from johnbeisner/NewAzurePackageStore
ASP .Net Core Runtime inclusion  in the CLI
2017-05-02 21:29:15 -07:00
Mike Lorbetske
dd827c5393 Update ASP.NET to 24801 - SetupCrossgen build 56 2017-05-02 21:04:50 -07:00
Eric Erhardt
31632e820c Merge pull request #6467 from dotnet-bot/release/2.0.0-UpdateDependencies
Update CoreSetup to preview1-002106 (release/2.0.0)
2017-05-02 18:20:34 -05:00
Livar Cunha
0b341a9afb Fixing a merge that ended up with double versions in the asp.net runtime store url. 2017-05-02 15:18:10 -07:00
Livar
e579548f81 Merge branch 'release/2.0.0' into NewAzurePackageStore 2017-05-02 14:27:20 -07:00
Livar
0560b1e546 Merge pull request #6463 from livarcocc/lzma_from_aspnet
Removing the code to generate the lzma archive
2017-05-02 14:26:11 -07:00
Eric Erhardt
0669d68a6d Merge branch 'release/2.0.0' into release/2.0.0-UpdateDependencies 2017-05-02 15:46:40 -05:00
William Li
7154330432 Address code review
Use one version for cli migrate packages

as well as Nuget component packages

Rename CreateWithWith...
2017-05-02 13:26:46 -07:00
Livar Cunha
5a6efef0e2 Updating the aspnet runtime version and handling tar.gz there. 2017-05-02 12:20:25 -07:00
Livar
416ea8166e Updating the aspnet runtime version to 56 2017-05-02 12:03:52 -07:00
jbeisner
04596fa707 Merge branch 'release/2.0.0' into NewAzurePackageStore 2017-05-01 22:49:08 -07:00
Livar Cunha
b8dd2b4619 Updating msbuild, SDK and Web SDK. 2017-05-01 21:46:51 -07:00
John Beisner
6ada5b7596 Inserting 'AspNetCorePackageStoreLib.wixlib' into the 'dotnet-dev-win' bundles. 2017-05-01 21:42:51 -07:00
dotnet-bot
7bcf72917b Update CoreSetup to preview1-002106 2017-05-02 04:27:51 +00:00
John Beisner
c6bc52c072 The 'AspNetRuntimePackageStorePublishDirectory' needs to be even shorter... 2017-05-01 13:14:16 -07:00
John Beisner
ad74a8bb96 Even shorter... 2017-05-01 13:08:16 -07:00
John Beisner
1a52f8457a The 'AspNetRuntimePackageStorePublishDirectory' needs to be very short due to path length constraints on Win8.1 2017-05-01 12:19:26 -07:00
William Li
2ab4ac5454 Adjust for using cli-migrate package reference
Remove ProjectJsonMigration and its test from solution file

Change dependecy by package reference instead of project 2 project

Construct the sln and dotnet new with wrapper that is used in migrate
package

Add reference to Nuget ProjectModel etc since CrossGen need it and it
cannot automatically get the reference
2017-05-01 10:50:37 -07:00
Livar Cunha
15c2bc2975 Creating a signing target that will handle resolver files. 2017-04-30 16:06:15 -07:00
Matt Ellis
b6a2c01cf6 Remove dependency on run.exe
Our build scripts were pulling down all of buildtools and run.exe in
service of "clean.{cmd|sh}". While having consisent commands across
the repos is a good thing to strive for, we are pulling down a bunch
of additional stuff we don't need for simple commands that have well
known analogs (e.g. git clean).

If we had been all in on run.exe, this might have made sense, but we
aren't, so it feels like something we should clean up.

By doing this, we can stop downloading bootstrap from github when we
build (super dangerous anyway because changes in buildtools could have
broken us).

In addition, I changed the way we install dotnet to just invoke the
script in `scripts/obtain/` instead of downloading a version from
GitHub. This makes local development of changes to obtain easier and
removes yet another place we had to download a script.
2017-04-29 14:00:02 -07:00
John Beisner
a4aa850f6b Merge remote-tracking branch 'upstream/release/2.0.0' into NewAzurePackageStore 2017-04-28 16:23:02 -07:00
Livar
9c85fc7fed Merge pull request #6436 from nguerrera/sdk-resolver
Add msbuild sdk resolver
2017-04-28 15:54:07 -07:00
Livar Cunha
cc9819ed93 Removing the code to generate the lzma archive and instead download it from the asp.net location. 2017-04-28 15:45:29 -07:00
John Beisner
53d900b19e Fixing the 'linux' ASP .Net Core Runtime archive download; and revving the version. 2017-04-28 14:23:25 -07:00
John Beisner
de46bf31d8 Add ASP .Net Core Runtime to the CombinedFrameworkSdk archive. 2017-04-28 12:25:46 -07:00
John Beisner
68487f775b Change in ASP .Net Core Runtime blob storage ZIP file naming convention. 2017-04-28 10:21:35 -07:00
John Beisner
1df11c3918 Moving to new version for ASP .Net Core Runtime; accounting for the split of the Windows ZIP ASP .Net Core Runtime for x64/x86; trivial formating 2017-04-28 09:57:29 -07:00
Livar Cunha
50c7b1e9b6 Copying the aspnet runtime store artifacts to stage2. 2017-04-28 00:10:19 -07:00
Nick Guerrera
fa4fe3b2c6 Package MSBuild SDK resolver in VS insertion nupkg 2017-04-27 23:07:19 -07:00
Nick Guerrera
d26b41a0c3 Add msbuild sdk resolver 2017-04-27 23:07:18 -07:00
Livar Cunha
7dadb150af Updating the URL for the aspnet runtime store artifacts. Fixing a typo on ExtractDestination and condition extraction on file extension rather than OS. 2017-04-27 22:36:47 -07:00
John Beisner
b43acf4752 Updated ASP .NET Core Runtime blob storage configuration. 2017-04-27 22:36:41 -07:00
John Beisner
27b77da7a1 ASP .NET Core Runtime in the CLI; work in progress 2017-04-27 22:36:33 -07:00
Mike Lorbetske
effe64f0dd Update ASP.NET packages to version 24686 2017-04-27 22:32:28 -07:00
Livar
38b3e21c99 Merge pull request #6442 from dotnet-bot/release/2.0.0-UpdateDependencies
Update CoreSetup to preview1-002101 (release/2.0.0)
2017-04-27 20:14:50 -07:00
Eric Erhardt
5a81be48d0 Update NET.Sdk to 20170428-1 2017-04-27 20:13:46 -05:00
dotnet-bot
6a03ff2255 Update CoreSetup to preview1-002101 2017-04-28 00:46:59 +00:00
Livar
2cc5612fec Merge pull request #6287 from dotnet/dev-ragrawal-updatenuget2484
update nuget version to 4.3.0-preview1-2500
2017-04-27 12:59:19 -07:00
Daniel Plaisted
0c210b6e49 Update to SDK version with support for tools deps file generation 2017-04-27 09:31:07 -07:00
Daniel Plaisted
01d3895b24 Add tests for behavior of tools that target previous major version of shared framework 2017-04-27 09:30:39 -07:00
dotnet-bot
42ad257436 Update CoreSetup to preview1-002091 2017-04-27 01:34:35 +00:00
Livar
b4214c8b18 Merge branch 'master' into dev-ragrawal-updatenuget2484 2017-04-26 16:35:18 -07:00
dotnet-bot
221e32d28c Update CoreSetup to preview2-002093 2017-04-26 23:24:46 +00:00
Livar Cunha
2e164f8f0a Merge branch 'release/2.0.0' into merge_release_200_again
* release/2.0.0:
  Adding a work around for a test failure.
  Generating the Microsoft.NETCoreSdk.BundledVersions.props file in the CLI folder, so that it can be picked up by the SDK.
2017-04-26 14:09:45 -07:00
Livar Cunha
51ce43cf5d Reverting some files that we don't want integrated back to master. 2017-04-26 11:45:26 -07:00
Livar Cunha
e6354edb81 Merge branch 'release/2.0.0' into merge_release_200
* release/2.0.0:
  Temporarily remove tools
  Update to latest ASP.NET package versions & fix feed entry in NuGet.config
  Fixing crossgen to use the correct RID for OSX and Win now that only portable packages are being produced.
  Update core-setup channel to release/2.0.0
  Update CoreSetup to preview1-002088
  Update templates and add 'baseline' feature
  Remove accidental debug line
  Localization for CommonOptions
  Merge pull request #6380 from livarcocc/update_channel
  Merge pull request #6362 from mlorbetske/dev/mlorbe/Update20Templates
2017-04-26 10:59:47 -07:00
Livar
6c8fa9dddd Merge branch 'master' into dev-ragrawal-updatenuget2484 2017-04-26 10:38:02 -07:00
Livar
8207b865f4 Merge branch 'release/2.0.0' into move_bundled_versions 2017-04-26 10:30:34 -07:00
Livar Cunha
339bfe0168 Adding a work around for a test failure. 2017-04-26 10:30:04 -07:00
Eric Erhardt
bb1c3df558 Merge remote-tracking branch 'upstream/release/2.0.0' into release/2.0.0-UpdateDependencies 2017-04-26 11:45:24 -05:00
Mike Lorbetske
80c23d53d3 Temporarily remove tools 2017-04-25 21:52:43 -07:00
Mike Lorbetske
dde0cee897 Update to latest ASP.NET package versions & fix feed entry in NuGet.config 2017-04-25 21:31:12 -07:00
Eric Erhardt
126c42050d Fixing crossgen to use the correct RID for OSX and Win now that only portable packages are being produced. 2017-04-25 23:00:20 -05:00
Eric Erhardt
de139a3bf8 Update core-setup channel to release/2.0.0 2017-04-25 22:29:50 -05:00
dotnet-bot
fd112f45a0 Update CoreSetup to preview1-002088 2017-04-26 03:16:03 +00:00
Zhi Li
ab0a68d32f update nuget version to 4.3.0-preview1-2500 2017-04-25 16:48:12 -07:00
Mike Lorbetske
9014b1b163 Update templates and add 'baseline' feature 2017-04-25 16:25:27 -07:00
Livar Cunha
7ebd363ca2 Generating the Microsoft.NETCoreSdk.BundledVersions.props file in the CLI folder, so that it can be picked up by the SDK. 2017-04-25 13:10:15 -07:00
dotnet-bot
195d11ceb5 Update CoreSetup to preview2-002081 2017-04-25 19:30:57 +00:00
Eric Erhardt
65662ea385 Merge branch 'master' into master-UpdateDependencies 2017-04-24 10:19:27 -05:00
Livar
63832070dd Merge pull request #6388 from livarcocc/bring_over_template_changes
Merge pull request #6362 from mlorbetske/dev/mlorbe/Update20Templates
2017-04-22 13:18:16 -07:00
Livar
6464e0152d Merge pull request #6380 from livarcocc/update_channel
Updating the release/2.0.0 channel and the README to point to this new channel
2017-04-22 12:03:22 -07:00
Livar Cunha
d78823c019 Revert "Merge pull request #6380 from livarcocc/update_channel"
This reverts commit 14cede7909, reversing
changes made to 8f2fcef544.
2017-04-22 12:01:57 -07:00
Livar
4f6fbc4a7f Merge pull request #6362 from mlorbetske/dev/mlorbe/Update20Templates
Update templates and engine, pin ASP.NET package versions, add web item templates
2017-04-22 12:00:08 -07:00
Livar
4992296d12 Merge pull request #6362 from mlorbetske/dev/mlorbe/Update20Templates
Update templates and engine, pin ASP.NET package versions, add web item templates
2017-04-22 11:52:54 -07:00
Livar
14cede7909 Merge pull request #6380 from livarcocc/update_channel
Updating the release/2.0.0 channel and the README to point to this new channel
2017-04-22 11:52:13 -07:00
Mike Lorbetske
8227a6edac Update templates, remove browserlink from checked packages 2017-04-21 22:10:57 -07:00
Mike Lorbetske
38e467e990 Fix build warning for web projects, add gracefull fallback for framework reference add attempts 2017-04-21 20:51:52 -07:00
Mike Lorbetske
2cbbea5b48 Put 195 engine version back 2017-04-21 20:51:52 -07:00
Mike Lorbetske
90cdb07cbc Try slightly earlier engine version 2017-04-21 20:51:52 -07:00
Mike Lorbetske
4dd1be1978 Respond to review feedback 2017-04-21 20:51:52 -07:00
Mike Lorbetske
9ea9cbc8a6 Update templates and engine, pin ASP.NET package versions, add web item templates 2017-04-21 20:51:52 -07:00
Eric Erhardt
88b99847e0 Fixing crossgen to use the correct RID for OSX and Win now that only portable packages are being produced. 2017-04-21 21:54:35 -05:00
dotnet-bot
31dbdfa197 Update CoreSetup to preview2-002066 2017-04-22 02:06:37 +00:00
Livar Cunha
41a2e46ca0 Updating the release/2.0.0 channel and the README to point to this new channel. 2017-04-21 16:11:14 -07:00
Livar Cunha
6df9bc3055 Moving master branch to preview2 branding. 2017-04-21 14:26:45 -07:00