Commit graph

6948 commits

Author SHA1 Message Date
Livar
44cd1cf385 Merge pull request #7100 from dotnet-bot/release/2.0.0-UpdateDependencies
Update CoreSetup to preview3-25507-02 (release/2.0.0)
2017-07-07 12:17:29 -07:00
Livar
94c08b1c45 Merge pull request #7097 from dotnet/stevesa/update-spa-templates-to-1.0.0-preview-000357
Update SPA templates to 1.0.0-preview-000358
2017-07-07 11:11:43 -07:00
dotnet-bot
9416028306 Update CoreSetup to preview3-25507-02 2017-07-07 17:36:54 +00:00
Steve Sanderson
27a2fdc708 Update SPA templates further to 1.0.0-preview-000358 2017-07-07 17:33:24 +01:00
Steve Sanderson
c7c7f20a22 Update SPA templates to 1.0.0-preview-000357 2017-07-07 16:25:22 +01:00
Livar
c2a0b305f4 Merge pull request #7093 from livarcocc/fix_x86_installer
Fix x86 installer
2017-07-06 21:17:56 -07:00
Livar
dcd62d452d Merge pull request #7094 from ellismg/port-mit-license-fix
MIT License *NIX Builds.
2017-07-06 18:27:34 -07:00
Matt Ellis
cde3a8bcb2 MIT License *NIX Builds.
Remove non MIT licensed components from the CLI when building on non
windows platforms. The shared framework provides the LICENSE file that is
included with the tarballs, so we just need to ensure we don't pull any
windows specific stuff that is not MIT licensed.

Fixes: dotnet/core-setup#676
2017-07-06 16:47:50 -07:00
Livar
7d867047e1 Merge pull request #7080 from dotnet/merges/rel/1.1.0-to-release/2.0.0-20170706-070029
Merge rel/1.1.0 to release/2.0.0
2017-07-06 16:37:54 -07:00
Livar Cunha
2770013d0d Updating the downlevel msi to embed the cab file in the msi itself. 2017-07-06 16:32:34 -07:00
Livar Cunha
1256bd0d57 Changing the name of the cab file generated by the two msis. Before they were stomping on each other. 2017-07-06 15:46:51 -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
Livar
1e0e5cb793 Merge pull request #7090 from mlorbetske/dev/mlorbe/UpdateToSetupCrossgen256Coherence26096
[Do Not Merge] Update to SetupCrossgen 256 - Coherence 26096
2017-07-06 15:26:33 -07:00
jbeisner
cd0c7741ae Merge pull request #7088 from johnbeisner/CoherentBadgeFix
Publishing a 'coherent' badge; part 2
2017-07-06 11:58:16 -07:00
Mike Lorbetske
9ba1bc1be0 Update to SetupCrossgen 256 - Coherence 26096 2017-07-06 11:11:15 -07:00
John Beisner
c617e5f0ce Changes per code review... 2017-07-06 11:11:07 -07:00
Livar Cunha
ab735d0885 Merge remote-tracking branch 'dotnet/rel/1.1.0' into merges/rel/1.1.0-to-release/2.0.0-20170706-070029
* dotnet/rel/1.1.0:
  Update F# to latest
2017-07-06 11:10:16 -07:00
Livar
7c9307dcbe Merge pull request #7077 from livarcocc/min_sdk_resolver
Adding a Minimum VS Defined SDK version to the resolver.
2017-07-06 11:03:08 -07:00
John Beisner
087f1830ef The 'Coherent' property needs to be available for 'FinishBuild' and 'PublishArtifacts' targets. 2017-07-06 09:21:59 -07:00
Ashley Hauck
9c2c9b7010 Update Roslyn to 2.3.0-beta4-61830-03 2017-07-06 08:31:40 -07:00
Ashley Hauck
cb9290e3a3 Update Roslyn to 2.3.0-beta4-61830-03 2017-07-06 08:30:32 -07:00
Livar
7b3478bf6f Merge pull request #7063 from KevinRansom/rel/1.1.0
Update F# to latest
2017-07-05 15:32:15 -07:00
Livar
ade5cf6c0a Merge pull request #7064 from KevinRansom/release/2.0.0
Update compiler
2017-07-05 13:39:26 -07:00
Livar
f85f029f35 Merge pull request #7067 from mlorbetske/dev/mlorbe/UpdateToSetupCrossgen246Coherence26065
Update to SetupCrossgen 249 - Coherence 26071
2017-07-05 13:38:55 -07:00
Livar
b83b69b588 Merge pull request #7073 from dotnet/merges/rel/1.1.0-to-release/2.0.0-20170705-070026
Merge rel/1.1.0 to release/2.0.0
2017-07-05 13:38:44 -07:00
Livar Cunha
ba5e56c3fe Merge remote-tracking branch 'dotnet/rel/1.1.0' into merges/rel/1.1.0-to-release/2.0.0-20170705-070026
* dotnet/rel/1.1.0:
  Copy Paste error
  chmod .sh files
  Update the SDK to 1.1.0-alpha-20170630-2
  Update Template Engine and templates for 1.x
2017-07-05 10:51:30 -07:00
Livar Cunha
2b15cb43cf Adding a Minimum VS Defined SDK version to the resolver. If it set to 1.0.4 if the minimum SDK version file is not found. 2017-07-05 09:54:46 -07:00
jbeisner
fc936a73ee Merge pull request #7047 from johnbeisner/CoherentBadgePublish
Publishing a 'coherent' badge.
2017-07-05 08:34:53 -07:00
Mike Lorbetske
a6a7c11916 Update to SetupCrossgen 249 - Coherence 26071 2017-07-03 22:37:02 -07:00
Livar
9e5a995ba9 Merge branch 'rel/1.1.0' into zhi/updateRel1.1.0NuGetTo4.3.0-preview4-4258 2017-07-03 19:02:52 -07:00
Livar
7d605497d9 Merge branch 'release/2.0.0' into CoherentBadgePublish 2017-07-03 17:58:25 -07:00
Livar
370771c076 Merge branch 'rel/1.1.0' into rel/1.1.0 2017-07-03 17:55:57 -07:00
Livar
19a90c79ce Merge pull request #7066 from dotnet/livarcocc-patch-1
Update runtime to 2.0.0-preview3-25502-01
2017-07-03 17:54:31 -07:00
Livar
dc17ca9675 Update runtime to 2.0.0-preview3-25502-01 2017-07-03 16:47:57 -07:00
John Beisner
af660e5a76 Conserving code-lines. 2017-07-03 14:34:04 -07:00
Livar
ae39d652e4 Merge pull request #7061 from dotnet/livarcocc-patch-1
Update SDK to 2.0.0-preview3-20170703-2
2017-07-03 12:20:28 -07:00
Livar
658f1d736c Merge pull request #7059 from dotnet/merges/rel/1.1.0-to-release/2.0.0-20170703-070029
Merge rel/1.1.0 to release/2.0.0
2017-07-03 12:11:06 -07:00
Livar
24c9e5604f Merge pull request #7046 from KevinRansom/mlorbetske-dev/mlorbe/UpdateTemplateEngineFor1x
Mlorbetske dev/mlorbe/update template engine for1x
2017-07-03 12:09:31 -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 Cunha
2b148aec90 Merge remote-tracking branch 'dotnet/rel/1.1.0' into merges/rel/1.1.0-to-release/2.0.0-20170703-070029
* dotnet/rel/1.1.0:
  feedback
  Enable VB for dotnet cli 1.1
  MSBuild 15.3.402
  Add F# to dotnet cli 1..1.0
2017-07-03 09:49:51 -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
Livar
7411667400 Merge pull request #7055 from wli3/unpinning-SDK-version
Revert "Pinning the SDK version to: "2.0.0-preview3-006628""
2017-07-03 09:32:29 -07:00
Kevin Ransom
c819188efb Update F# to latest 2017-07-01 13:07:02 -07:00
Mike Lorbetske
557dd8d376 Update to SetupCrossgen 229 - Coherence 26027 2017-07-01 11:26:48 -07:00
William Li
dd137f6b42 Revert "Pinning the SDK version to: "2.0.0-preview3-006628""
This reverts commit 0dd17b6330.
2017-06-30 22:42:00 -07:00
William Li
bf496a9b12 Update bages to aligan with linux buid definition 2017-06-30 19:33:37 -07:00
John Beisner
0dd17b6330 Pinning the SDK version to: "2.0.0-preview3-006628" 2017-06-30 17:42:42 -07:00
Livar
277741b55c Merge pull request #7049 from billwert/fixinstallblock
Installation block does not work
2017-06-30 15:55:19 -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