Commit graph

400 commits

Author SHA1 Message Date
Zhi Li
759ac544d4 update to NuGet 4.3.0-preview4-4258 2017-06-30 11:11:04 -07:00
Livar
f64b772f7f Merge branch 'release/2.0.0' into patch-1 2017-06-30 10:12:51 -07:00
Vijay Ramakrishnan
fa852d3059 Updating the WebSdk version to 2.0.0-rel-20170629-588 2017-06-29 21:27:22 -07:00
Livar
5f52644061 Merge pull request #7031 from mlorbetske/dev/mlorbe/UpdateToSetupCrossgen225Coherence25975
Update engine and templates, update to SetupCrossgen 224 - Coherence 25975
2017-06-29 14:35:33 -07:00
Livar
57c0d17e7a Merge branch 'release/2.0.0' into dev/mlorbe/UpdateToSetupCrossgen225Coherence25975 2017-06-29 10:28:37 -07:00
Livar
825dc4277d Merge branch 'release/2.0.0' into msbuild-402-for-2 2017-06-29 10:25:34 -07:00
Mike Lorbetske
d8087d35d4 Update engine and templates, update to SetupCrossgen 224 - Coherence 25975 2017-06-29 10:16:02 -07:00
Rainer Sigwald
b6931ab0c5 MSBuild 15.3.402 2017-06-29 09:32:52 -07:00
dotnet-bot
9c913674c9 Update CoreSetup to preview3-25428-01 2017-06-28 17:35:53 +00:00
Arun Mahapatra
29db52a40d Update test platform to 15.3.0-preview-20170628-02 2017-06-28 15:59:19 +05:30
Livar
81dd304f72 Merge pull request #7011 from dotnet/livarcocc-patch-1
Update Microsoft.NET.SDK to 2.0.0-preview3-20170622-1
2017-06-27 16:20:16 -07:00
Livar
7c928a9f18 Update Microsoft.NET.SDK to 2.0.0-preview3-20170622-1 2017-06-27 14:27:20 -07:00
Nick Guerrera
34d0900a34 Use latest command line parser 2017-06-27 10:03:53 -07:00
Livar
017e3e7c91 Merge branch 'release/2.0.0' into pay_for_play_loc 2017-06-26 21:41:52 -07:00
Livar
6fc24fca4f Updating the runtime to pick up the satellite assembly host fix. 2017-06-26 17:00:35 -07:00
Livar Cunha
2f75cc2517 Merge remote-tracking branch 'dotnet/release/2.0.0-preview2' into merge_release200_preview2_into_release_200
* dotnet/release/2.0.0-preview2:
  Update SPA templates version to 1.0.0-preview-000321
  Fix dotnet/sdk#1364
  Add rhel and Debian download link
  Remove failed workaround for Microsoft.Composition warning
  Update templates to add missing BrowserLink package
  Update to SetupCrossgen 215 - Coherence 25794
  Update templates to suppress the warning for Microsoft.Composition and AssetTargetFallback
  Add explicit dependency for pakcage smoke test
  Update templates to remove the package NETStandard.Library.NETFramework
  Update F# compiler to latest
  Update to SetupCrossgen 213 - Coherence 25769
  Pinning to the dotnet-install to version '2.0.0-preview2-006470'
  Updating branch/channel information.
  Update SpaTemplateVersion to 1.0.0-preview-000312
  Update to SetupCrossgen 210 - Coherence 25756
  Absorb F# and B2C template fixes
  The links at blob storage will change from "release/2.0.0" to "release/2.0.0-preview2"
  Changing two links from explicit to relative.
  Updating the links in the README; fixing the installation script.
  Update to SetupCrossgen 201 - Coherence 25722
2017-06-26 15:33:56 -07:00
Nick Guerrera
b8a2ce4e8c Merge pull request #6997 from nguerrera/loc-compilers
Add F# and Roslyn satellites
2017-06-26 11:10:49 -07:00
Nick Guerrera
14977b7201 Add F# and Roslyn satellites 2017-06-23 19:48:38 -07:00
Eric Erhardt
6119a29f83 Reenable UpdateVersionsRepo
Now that https://github.com/dotnet/buildtools/issues/1547 is fixed.
2017-06-23 09:09:56 -05:00
Steve Sanderson
6ef4086946 Update SPA templates version to 1.0.0-preview-000321 2017-06-22 16:52:00 +01:00
Kevin Ransom
78309e52fa Fix dotnet/sdk#1364 2017-06-21 17:43:43 -07:00
Rainer Sigwald
eb3e28d3e8 MSBuild 15.3.400 2017-06-21 18:18:30 -05:00
Mike Lorbetske
9edfb7a7d4 Remove failed workaround for Microsoft.Composition warning 2017-06-20 17:02:16 -07:00
Mike Lorbetske
b03f72ea26 Update templates to add missing BrowserLink package 2017-06-20 11:11:19 -07:00
Livar Cunha
58e18a61b7 Fixing CRLF issue. 2017-06-20 10:59:23 -07:00
Mike Lorbetske
318ec3ab28 Update to SetupCrossgen 215 - Coherence 25794 2017-06-19 23:14:01 -07:00
Livar Cunha
69e2db5251 Updating xlf and fixing line ending problems with one file. 2017-06-19 21:37:47 -07:00
Mike Lorbetske
c2539e8e4f Update templates to suppress the warning for Microsoft.Composition and AssetTargetFallback 2017-06-19 17:21:14 -07:00
Nick Guerrera
013d404364 Merge pull request #6800 from nguerrera/loc
Use xlf to build satellites and enable CLI localization
2017-06-19 17:20:21 -07:00
Livar
642494b608 Merge pull request #6938 from mlorbetske/dev/mlorbe/UpdateTemplatesToRemoveThePackageNETStandardLibraryNETFramework
Update templates to remove the package NETStandard.Library.NETFramework
2017-06-19 15:06:53 -07:00
Livar
c4a072be1c Merge pull request #6932 from khyperia/update_roslyn_in_20
Updating Roslyn to 2.3.0-beta3-61816-04 in 2.0.0
2017-06-19 15:00:47 -07:00
Mike Lorbetske
ae84438f62 Update templates to remove the package NETStandard.Library.NETFramework 2017-06-19 13:22:58 -07:00
Kevin Ransom
8ec9cbfcae Update F# compiler to latest 2017-06-19 13:19:28 -07:00
dotnet-bot
3d7d153b21 Update CoreSetup to preview3-25419-01 2017-06-19 17:38:57 +00:00
Livar
2180d92d10 Merge pull request #6918 from Faizan2304/insertTPV2
insert new tpv2 which fixes following issue
2017-06-19 09:28:29 -07:00
Ashley Hauck
2a003ef245 Updating Roslyn to 2.3.0-beta3-61816-04 2017-06-19 08:53:58 -07:00
dotnet-bot
cefdd8bd4e Update CoreSetup to preview3-25418-01 2017-06-18 17:38:18 +00:00
faahmad
6f69b87b53 insert new tpv2 which fixes following issue
https://github.com/Microsoft/vstest/issues/632
https://github.com/Microsoft/vstest/issues/844
https://github.com/Microsoft/vstest/issues/847
https://github.com/Microsoft/vstest/issues/840
https://github.com/Microsoft/vstest/issues/843
2017-06-18 16:06:24 +05:30
Mike Lorbetske
705982648d Update to SetupCrossgen 213 - Coherence 25769 2017-06-16 19:12:25 -07:00
Nick Guerrera
11967b7d9c Merge branch 'release/2.0.0' into loc 2017-06-16 18:20:44 -07:00
Livar
5616284dd7 Merge pull request #6905 from dotnet/stevesa/update-spa-templates-to-preview-312
Update SpaTemplateVersion to 1.0.0-preview-000312
2017-06-16 09:26:51 -07:00
Steve Sanderson
825812da57 Update SpaTemplateVersion to 1.0.0-preview-000312 2017-06-16 13:30:52 +02:00
Mike Lorbetske
19091ef648 Update to SetupCrossgen 210 - Coherence 25756 2017-06-15 23:52:28 -07:00
Mike Lorbetske
4ec13b415d Absorb F# and B2C template fixes 2017-06-15 17:04:15 -07:00
Mike Lorbetske
a65477ba35 Update to SetupCrossgen 201 - Coherence 25722 2017-06-15 15:22:48 -07:00
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