Commit graph

355 commits

Author SHA1 Message Date
dotnet-bot
8c8df3eb57 Update CoreSetup to preview3-25415-01 2017-06-15 18:25:09 +00:00
Livar
c457b9840d Update SDK to 2.0.0-preview2-20170615-7 2017-06-15 09:29:29 -07:00
Livar Cunha
26a409c41c Updating Roslyn to 2.3.0-beta3-61814-09 2017-06-14 21:57:28 -07:00
Livar
dc88177546 Merge pull request #6873 from emgarten/emgarten/nuget4168-2.0.0
Updating NuGet to 4.3.0-preview3-4168 for release/2.0.0
2017-06-14 17:23:25 -07:00
Livar
fba8b7b50d Merge pull request #6865 from rainersigwald/msbuild-insertion-2.0
MSBuild 15.3.388 (2.0)
2017-06-14 16:20:02 -07:00
Justin Emgarten
75de59f9ce Updating NuGet to 4.3.0-preview3-4168 2017-06-14 12:15:59 -07:00
Rainer Sigwald
061a87fc82 MSBuild 15.3.388 2017-06-14 10:29:49 -05:00
Livar Cunha
0a4a0a082c Updating the SDK. Mostly, had to change PackageTargetFallback to AssetTargetFallback. 2017-06-14 00:27:26 -07:00
Steve Sanderson
cda914a365 Update SpaTemplateVersion to 1.0.0-preview-000297 2017-06-13 22:10:25 +01:00
Mike Lorbetske
cfd158c6d4 Update to SetupCrossgen 186 - Coherence 25661 2017-06-12 17:58:03 -07:00
Nick Guerrera
a2a33591ce Merge branch 'release/2.0.0' into loc 2017-06-12 15:06:54 -07:00
Livar
11bf7530c9 Merge pull request #6818 from dsplaisted/6738-Add-Build-Extensions-To-VS
Add Microsoft.NET.Build.Extensions files to package for VS insertion
2017-06-11 19:02:42 -07:00
Livar
c5556d0c10 Merge pull request #6823 from dotnet/livarcocc-patch-1
Update MSBuild to 15.3.0-preview-000384-01 in 2.0.0
2017-06-11 18:58:02 -07:00
Livar
ce8318a672 Another update to msbuild. To 15.3.0-preview-000385-01. 2017-06-11 00:10:47 -07:00
Mike Lorbetske
9e899aa49f Update to SetupCrossgen 183 - Coherence 25615 2017-06-10 01:51:35 -07:00
Daniel Plaisted
02292a1fdc Merge upstream changes 2017-06-09 18:31:48 -07:00
Daniel Plaisted
9659749eeb Update version of SDK and MS.NET.Build.Extensions, adapt to layout change 2017-06-09 18:18:55 -07:00
Livar
aa712fb02e Update MSBuild to 15.3.0-preview-000384-01 2017-06-09 15:32:59 -07:00
Ankit Mishra
dfe5a06818 Updating NuGet version to Preview3-4154 2017-06-09 12:01:21 -07:00
Nick Guerrera
31c5294ef5 Merge branch 'release/2.0.0' into loc 2017-06-09 10:30:29 -07:00
Daniel Plaisted
6b44f8938b Merge upstream changes 2017-06-09 00:43:29 -07:00
Livar
ef5d4b47c3 Merge pull request #6792 from dotnet/livarcocc-patch-2
Update Microsoft.Net.SDK version to 2.0.0-preview2-20170608-1.
2017-06-08 22:53:12 -07:00
Livar
dc7a3c4b6a Merge pull request #6810 from codito/tp-20170609-02
Update test platform to 15.3.0-preview-20170609-02.
2017-06-08 21:21:01 -07:00
Arun Mahapatra
c5790924ad Update test platform to 15.3.0-preview-20170609-02.
Fixes:
https://github.com/Microsoft/vstest/issues/847
2017-06-09 09:02:46 +05:30
Mike Lorbetske
0e0c31a6c4 Update to template build 256 to fix Web Auth scenarios 2017-06-08 16:26:09 -07:00
Daniel Plaisted
ac8a464450 Update to SDK and MS.NET.Build.Extensions versions with latest fixes, fix RestoreDependency.proj to work when SdkLayoutDirectory isn't set 2017-06-08 15:25:32 -07:00
Livar
eb6e08f522 Merge pull request #6804 from mlorbetske/dev/mlorbe/UpdateSetupCrossgen168Coherence25571
Update to SetupCrossgen 168 - Coherence 25571
2017-06-08 11:03:45 -07:00
Steve Sanderson
3f606e545e Update SpaTemplateVersion to 1.0.0-preview-000286 2017-06-08 17:41:47 +01:00
Mike Lorbetske
ea6f18aaf4 Update to SetupCrossgen 168 - Coherence 25571 2017-06-08 09:38:54 -07:00
Nick Guerrera
dfc03e7f2c Build localized satellite assemblies 2017-06-07 20:22:27 -07:00
Eric Erhardt
3f5e5241a3 Update SDK to 2.0.0-preview2-20170608-1 2017-06-07 20:49:28 -05:00
Daniel Plaisted
3a61ba1d20 Add Microsoft.NET.Build.Extensions and corresponding DLLs in CLI layout 2017-06-07 17:27:34 -07:00
Livar
ac4ee80dd8 Merge pull request #6790 from dotnet/livarcocc-patch-1
Updating the version of the migration library
2017-06-07 16:10:17 -07:00
Livar
ff0c65e8a6 Update Microsoft.Net.SDK version to 2.0.0-preview2-20170607-3. 2017-06-07 14:49:32 -07:00
Livar
1f85f5d9d1 Updating the version of the migration library
This is to avoid a bunch of downgrade warnings due to NuGet.
2017-06-07 14:16:34 -07:00
Livar
bb6be05acc Merge branch 'release/2.0.0' into msbuild-15.3.378 2017-06-07 13:52:17 -07:00
Rainer Sigwald
947271f8ec MSBuild 15.3.378 2017-06-07 14:13:58 -05:00
dotnet-bot
967d8193e9 Update CoreSetup to preview2-25407-01 2017-06-07 18:24:15 +00:00
Livar
1860b07a29 Merge pull request #6779 from mlorbetske/dev/mlorbe/UpdateToSetupCrossgen158Coherence25487
Update to SetupCrossgen 158 - Coherence 25487
2017-06-07 08:33:03 -07:00
Justin Emgarten
dcbdc46b44 Updating NuGet to 4.3.0-preview3-4146 2017-06-07 01:45:15 -07:00
Mike Lorbetske
da15436ca8 Update to SetupCrossgen 158 - Coherence 25487 2017-06-06 16:56:46 -07:00
dotnet-bot
4cdbd93ce6 Update CoreSetup to preview2-25406-03 2017-06-06 17:02:32 +00:00
Steve Sanderson
7e0747ec89 Bundle SPA templates package 2017-06-06 11:11:34 +01:00
Kevin Ransom (msft)
ac3ed6fbe6 Merge pull request #6743 from KevinRansom/release/2.0.0
This updates the F# compiler to the latest nuget published build.
2017-06-05 12:00:43 -07:00
Mike Lorbetske
123b3d2a44 Minor template fixes 2017-06-02 21:35:46 -07:00
Mike Lorbetske
96f9190293 Fix Coherence version 2017-06-02 14:09:32 -07:00
Mike Lorbetske
15cd450ba5 Fix SetupCrossgen version 2017-06-02 14:09:00 -07:00
Mike Lorbetske
093c8ecfca Update to SetupCrossgen 142 - Coherence 25368, add support for timestamped stores for the MSI 2017-06-02 13:57:08 -07:00
Livar
4fe8fc2faf Merge branch 'release/2.0.0' into release/2.0.0 2017-06-02 09:57:16 -07:00
Kevin Ransom
906bde83ec todays compiler 2017-06-02 09:12:31 -07:00
dotnet-bot
a52f63854b Update CoreSetup to preview2-25402-02 2017-06-02 06:26:42 +00:00
Livar
f6d040a3fa Updating the SDK to one built with the same NuGet 2017-06-01 20:56:19 -07:00
Ashish Jain (NUGET)
ae128648d5 Updated NuGet version for VS15.3 preview3 2017-06-01 18:01:12 -07:00
Kevin Ransom
2cfad18b0b This updates the F# compiler to the latest nuget published build. 2017-06-01 17:38:20 -07:00
Livar
413fa23eee Merge pull request #6731 from livarcocc/merge_rel_110
Merge rel/1.1.0 into release/2.0.0
2017-06-01 11:54:16 -07:00
Eric Erhardt
ea40317e18 Merge branch 'release/2.0.0' into release/2.0.0-UpdateDependencies 2017-06-01 12:28:54 -05:00
Livar Cunha
5c6e7daca9 Updating NuGet. 2017-06-01 10:23:53 -07:00
Faizan2304
a6e4a18157 insert new bits of TestPlatform which has bug fixes. 2017-06-01 17:06:12 +05:30
Mike Lorbetske
c28b454ecd Update to SetupCrossgen 134 - Coherence 25332 2017-05-31 21:47:18 -07:00
Eric Erhardt
4992b6399e Update dotnet-deb-tool to 2.0.0-preview2-25331-01 2017-05-31 16:38:44 -05:00
dotnet-bot
4b1c20c91d Update CoreSetup to preview2-25331-01 2017-05-31 17:19:19 +00:00
Eric Erhardt
ba2b752642 Update SDK to 2.0.0-preview2-20170531-2 2017-05-30 21:38:59 -05:00
mlorbetske
bca531796f Update to SetupCrossgen 128 - Coherence 25179 2017-05-27 00:14:37 -07:00
Eric Erhardt
dad6ead170 update the SDK version to 2.0.0-preview2-20170524-8 2017-05-25 11:56:55 -05:00
dotnet-bot
e6e103314c Update CoreSetup to preview2-25324-03 2017-05-24 17:18:33 +00:00
Livar
726b86cc8d Merge branch 'release/2.0.0' into update-sdk 2017-05-24 09:05:06 -07:00
Nick Guerrera
69a460191f Update dotnet/sdk version 2017-05-24 04:01:07 -07:00
Livar
cf28ca657a Merge pull request #6670 from mlorbetske/dev/mlorbe/UpdateToSetupCrossgen124Coherence25158
Update to SetupCrossgen 125 - Coherence 25159
2017-05-23 22:19:50 -07:00
Livar
1465718fc4 Merge pull request #6641 from ellismg/update-roslyn-version
Move Roslyn to latest 15.3 version
2017-05-23 22:18:25 -07:00
Matt Ellis
eb60245975 Update Roslyn to latest 15.3 version 2017-05-23 16:56:41 -07:00
Mike Lorbetske
33e8e7dfde Update to SetupCrossgen 125 - Coherence 25159 2017-05-23 09:36:24 -07:00
Vijay Ramakrishnan
82629fa44b Updating the websdk version to 2.0.0-rel-20170518-512 2017-05-22 17:51:01 -07:00
Nick Guerrera
c1933a014b Update dotnet/sdk version 2017-05-22 15:17:29 -07:00
Mike Lorbetske
6c57226079 Update to SetupCrossgen 123 - Coherence 25149 2017-05-22 14:02:33 -07:00
mlorbetske
0dd30b92d5 Update to SetupCrossGen 121 - Coherence 25102 2017-05-22 11:48:30 -07:00
Livar
f3719953e8 Merge branch 'master' into update_msbuild 2017-05-20 21:44:47 -07:00
Kevin Ransom (msft)
cf9967bcd2 Add fsc to distribution (#6508)
* Add fsc to distribution

* update package

* Update compiler version

* I'm not sure these do anything usefull

* Reenable f# new project tests

* Revert "Reenable f# new project tests"

This reverts commit 34d294ec8c42145cf8cf0af166f9dfc8ee51b6f8.

* merge

* Update fsharp version

* Update compiler version

* Review feedback

* review feedback

* Update DependencyVersions.props
2017-05-19 23:20:19 -07:00
Livar Cunha
28e25657cb Updating msbuild to 15.3.0-preview-000246-05. 2017-05-19 20:59:07 -07:00
Eric Erhardt
403b9717ae Update Core-Setup to 2.0.0-preview2-25319-02 2017-05-18 20:54:31 -05:00
dotnet-bot
02e7c8d0a8 Update CoreSetup to preview2-25317-03 2017-05-17 01:18:54 +00:00
Eric Erhardt
5fef379acc Update MSBuild to 15.3.0-preview-000234-01
This build has the new RuntimeInformation feature in MSBuild which allows MSBuild logic to be able to tell if you are building on OSX or Linux.
2017-05-16 13:42:17 -05:00
Eric Erhardt
f82fa91f58 Fix update-dependencies by slimming it way down.
It can no longer be dependent on Cli.Utils, since that will affect which version of NuGet gets used.  It's better for this small console app to just depend on VersionTools.
2017-05-11 10:15:05 -05:00
Livar
25bcbb65d3 Merge branch 'master' into fix_vso_build 2017-05-10 17:17:00 -07:00
Livar Cunha
dd01dbf4ce Bringing down MicroBuild.Core props and targets separately from build_tools. 2017-05-10 15:58:46 -07:00
Livar
f40e85283d Merge branch 'master' into merge_release_200_into_master 2017-05-10 12:49:25 -07:00
Livar Cunha
b51920d212 Merge branch 'release/2.0.0' into merge_release_200_into_master
* release/2.0.0:
  Fixing tests to look for 1.1.2.
  Updating the backwards compatible runtime to 1.1.2.
  Updating the SDK to one that carries updated versions of the implicit 1.0 versions.
  Update to SetupCrossgen 92 - Coherence 24937
  Update to SetupCrossgen 86 - Coherence 24920
  Fix date on package version
  Update templates to 222
  Update SetupCrossgen to build 82
  Update SetupCrossgen to build 80
  Update SetupCrossgen to build 77
2017-05-09 20:51:32 -07:00
Eric Erhardt
3aba7b8a55 Update Core-Setup to 2.0.0-preview2-25309-07 2017-05-09 15:58:03 -05:00
Livar Cunha
af453e3a6b Updating the SDK to one that carries updated versions of the implicit 1.0 versions. 2017-05-09 11:09:38 -07:00
Mike Lorbetske
5436217013 Update to SetupCrossgen 92 - Coherence 24937 2017-05-08 17:54:10 -07:00
Mike Lorbetske
b3204bedb8 Update to SetupCrossgen 86 - Coherence 24920 2017-05-06 19:21:17 -07:00
Christopher Costa
cc2cbd4d7f Undo back dependencymodel / platformabstractions change 2017-05-06 13:16:56 -07:00
Christopher Costa
f9cebfda09 update versions to 25306-06 2017-05-06 12:18:35 -07:00
Christopher Costa
49636ea608 Merge branch 'master' of https://github.com/dotnet/cli into version-25305-19 2017-05-06 12:17:03 -07:00
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
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
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
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
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
416ea8166e Updating the aspnet runtime version to 56 2017-05-02 12:03:52 -07:00
Livar Cunha
b8dd2b4619 Updating msbuild, SDK and Web SDK. 2017-05-01 21:46:51 -07:00
dotnet-bot
7bcf72917b Update CoreSetup to preview1-002106 2017-05-02 04:27:51 +00: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
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
Nick Guerrera
d26b41a0c3 Add msbuild sdk resolver 2017-04-27 23:07:18 -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
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
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
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
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
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
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