Commit graph

314 commits

Author SHA1 Message Date
Livar
7e1fe7eba7 Merge pull request #7095 from dotnet/merges/release/2.0.0-to-master-20170707-070029
Merge release/2.0.0 to master
2017-07-07 11:10:48 -07:00
Livar
512b568e33 Merge pull request #7085 from codito/patch-1
Update test platform to 15.3.0-preview-20170703-02
2017-07-06 18:25:44 -07:00
Livar
72007065e2 Merge pull request #7087 from khyperia/update_roslyn_20
Update Roslyn to 2.3.0-beta4-61830-03 in 2.0.0
2017-07-06 15:27:37 -07:00
Mike Lorbetske
9ba1bc1be0 Update to SetupCrossgen 256 - Coherence 26096 2017-07-06 11:11:15 -07:00
Ashley Hauck
9c2c9b7010 Update Roslyn to 2.3.0-beta4-61830-03 2017-07-06 08:31:40 -07:00
Arun Mahapatra
3380fee934 Update test platform to 15.3.0-preview-20170703-02
* Adds support for running net46 tests on non windows machines if mono is installed
2017-07-06 20:36:52 +05:30
Livar
ade5cf6c0a Merge pull request #7064 from KevinRansom/release/2.0.0
Update compiler
2017-07-05 13:39:26 -07:00
Mike Lorbetske
a6a7c11916 Update to SetupCrossgen 249 - Coherence 26071 2017-07-03 22:37:02 -07:00
Livar
dc17ca9675 Update runtime to 2.0.0-preview3-25502-01 2017-07-03 16:47:57 -07:00
Kevin Ransom
6363063076 Update compiler 2017-07-03 11:04:01 -07:00
Livar
c7d9dba0d2 Update SDK to 2.0.0-preview3-20170703-2 2017-07-03 10:12:04 -07:00
Livar
0578b62490 Merge pull request #7057 from mlorbetske/dev/mlorbe/UpdateToSetupCrossgen229Coherence26027
Update to SetupCrossgen 229 - Coherence 26027
2017-07-03 09:33:16 -07:00
Mike Lorbetske
557dd8d376 Update to SetupCrossgen 229 - Coherence 26027 2017-07-01 11:26:48 -07:00
Livar
caddc68e6f Merge pull request #7017 from codito/patch-1
Update test platform to 15.3.0-preview-20170628-02
2017-06-30 15:55:06 -07:00
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