Commit graph

1128 commits

Author SHA1 Message Date
Livar
e94b45aa6f Merge pull request #7138 from rainersigwald/msbuild-406-for-1.1
MSBuild 15.3.406
2017-07-12 21:21:52 -07:00
Livar
50fa4461d1 Update the SDK to 1.1.0-alpha-20170713-1
This carries the version cap for the 1.1 SDK.

It has already been approved for insertion into VS.
2017-07-12 17:00:24 -07:00
Rainer Sigwald
82dc7fdebb MSBuild 15.3.406 2017-07-12 17:26:01 -05:00
Rainer Sigwald
eb640dee84 MSBuild 15.3.406 2017-07-12 17:23:13 -05:00
Livar
ad19b4441f Merge branch 'release/2.0.0' into dev/mlorbe/UpdateToCoherence26239 2017-07-12 12:25:45 -07:00
Mike Lorbetske
88c14cb40d Update to Coherence 26239
Updates store and archive acquisition for the change that no longer has a different number for the SetupCrossgen build
2017-07-12 10:54:53 -07:00
dotnet-bot
b783f0c328 Update CoreSetup to preview3-25512-01 2017-07-12 17:18:01 +00:00
dotnet-bot
c5c6e22de4 Update CoreSetup to preview3-25511-03 2017-07-11 22:20:37 +00:00
Mike Lorbetske
5aec446657 Update to SetupCrossgen 277 - Coherence 26182
Enable loc for dotnet new
2017-07-10 15:20:35 -07:00
John Beisner
d9cfe3344b Linux portable should not try to publish to the Debian repo. 2017-07-10 10:06:23 -07:00
dotnet-bot
e04b35fbbf Update CoreSetup to preview3-25510-01 2017-07-10 00:28:50 +00:00
Mike Lorbetske
e316bd0f9c Update to SetupCrossgen 270 - Coherence 26151
Add localization package for template engine

Fix issue where unknown symbols are treated as literals in MSBuild files

Fix issue where files marked for copy-only processing are excluded instead
2017-07-07 19:45:59 -07:00
Livar
5aec20eeb9 Merge pull request #7050 from dotnet/zhi/updateRel1.1.0NuGetTo4.3.0-preview4-4258
update nuget to 4.3.0-preview4-4258
2017-07-07 13:36:36 -07:00
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
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
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
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
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
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
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
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
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
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
bf496a9b12 Update bages to aligan with linux buid definition 2017-06-30 19:33:37 -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
207a7e4307 update nuget to 4.3.0-preview4-4258 2017-06-30 14:25:46 -07:00
John Beisner
502c082846 Publishing a 'coherent' badge. 2017-06-30 12:17:20 -07:00
Kevin Ransom
3d9bcf4490 Copy Paste error 2017-06-30 12:03:04 -07:00
Kevin Ransom
47ef990e66 chmod .sh files 2017-06-30 11:58:16 -07:00
Zhi Li
759ac544d4 update to NuGet 4.3.0-preview4-4258 2017-06-30 11:11:04 -07:00
Livar
4454c4e191 Update the SDK to 1.1.0-alpha-20170630-2
This SDK contains the F# targets.
2017-06-30 10:15:07 -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
425850697b Merge pull request #7019 from livarcocc/framework_downlevel_msi
Adding a installer for Downlevel (Dev14) to install .NET Framework pr…
2017-06-29 20:07:13 -07:00
Mike Lorbetske
0dd4f123d2 Update Template Engine and templates for 1.x 2017-06-29 19:09:54 -07:00
Livar
13e84f7cbd Merge pull request #7033 from KevinRansom/rel/1.1.0
Add F# to dotnet cli 1.1.0
2017-06-29 18:25:59 -07:00
Livar
7d25028834 Merge pull request #7032 from KevinRansom/vb
Enable VB for dotnet cli 1.1
2017-06-29 18:25:46 -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
Kevin Ransom
508ad89a44 Enable VB for dotnet cli 1.1 2017-06-29 10:27:06 -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
Livar Cunha
a396550ed0 Adding a installer for Downlevel (Dev14) to install .NET Framework props and targets to enable it to reference netstandard 2.0. 2017-06-29 09:55:26 -07:00
Rainer Sigwald
2746e5cc2d MSBuild 15.3.402 2017-06-29 09:33:54 -07:00
Rainer Sigwald
b6931ab0c5 MSBuild 15.3.402 2017-06-29 09:32:52 -07:00
Kevin Ransom
db7ebc9100 Add F# to dotnet cli 1..1.0 2017-06-28 21:18:39 -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
8dc9ff1ad6 Fixing some merges from release/2.0.0-preview2. 2017-06-26 15:40:26 -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
Livar Cunha
126ec29fe2 Generating a layout folder with the satellite assemblies only which we use to generate a language pack tarball/zip. Initially, I wanted a IncludeOnlyFilter, but couldn't quite get that to work on tar, just passing the filter in the command line didn't work because the shell does not do recursive globbing. So, I opted for the layout folder. 2017-06-22 12:59:38 -07: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
dded62282e MSBuild 15.3.400 2017-06-21 18:20:40 -05:00
Rainer Sigwald
eb3e28d3e8 MSBuild 15.3.400 2017-06-21 18:18:30 -05:00
Livar Cunha
44d888dfc4 Exclude satellite assemblies from archive. 2017-06-21 08:48:12 -07: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
Livar
64a541ed3e Merge pull request #6900 from wli3/windows-installer-refresh
Windows installer refresh
2017-06-19 20:50:21 -07:00
Livar
7ab3d5b8d8 Merge pull request #6941 from wli3/fix-package-smoke-test
Add explicit dependency for pakcage smoke test
2017-06-19 20:50:05 -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
William Li
7ca900d9ec Add explicit dependency for pakcage smoke test
So package smoke test can be run without full functional test run first.
2017-06-19 14:30:03 -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
Ashley Hauck
549292ecf9 Updating Roslyn to 2.3.0-beta3-61816-04 2017-06-19 10:46:17 -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
William Li
07ce4a0607 Windows installer refresh
According to https://github.com/dotnet/cli/issues/6683

- Remove Motto
- Change size to fit the first screen
- Update Introduction step content
- Include installation location and list of all components installed
- Update Summary step content
2017-06-16 12:47:11 -07:00
Livar
3aa22300ac Merge pull request #6906 from wli3/publish-only-deb
Stop produce duplicated package for VSTS build definition
2017-06-16 10:07:13 -07:00
John Beisner
5b17eb36a4 Updating branch/channel information. 2017-06-16 09:57:54 -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
William Li
68c71d225b Stop produce duplicated package for VSTS build definition
Currently VSTS is producing duplicate package and they are running into
each other will producing

Today:
Linux x64 build definition: both .deb and .tar.gz
Ubuntu 16.04 build definition: both .deb and .tar.gz (ex.
dotnet-sdk-2.0.0-preview3-006477-linux-x64.tar.gz,
dotnet-sdk-debug-2.0.0-preview3-006477-linux-x64.tar.gz,
dotnet-sdk-internal-2.0.0-preview3-006477-linux-x64.tar.gz)

After this change:
Linux x64: .tar.gz
Ubuntu 16.04: .deb

No change for windows and macOS
Tested on Ubuntu with and without --linux-portable and windows
2017-06-16 07:32:20 -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
Livar
f720c289d3 Merge pull request #6889 from dotnet-bot/release/2.0.0-UpdateDependencies
Update CoreSetup to preview3-25415-01 (release/2.0.0)
2017-06-15 17:27:15 -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
William Li
30ef374785 Add explicit dependency for pakcage smoke test
So package smoke test can be run without full functional test run first.
2017-06-15 15:03:07 -07:00
Livar
9f0584f449 Updating the branding for 2.0 to preview3 2017-06-15 11:42:06 -07:00
dotnet-bot
8c8df3eb57 Update CoreSetup to preview3-25415-01 2017-06-15 18:25:09 +00:00
jbeisner
add33234a5 Merge pull request #6857 from johnbeisner/RuntimeCoherence
Enable creation and consumption of a 'coherent' pointer
2017-06-15 10:22:40 -07: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
23bf02f398 Update SDK to 1.1.0-alpha-20170615-3 2017-06-14 21:24:55 -07:00
Livar Cunha
42c65b4fe9 Turn off UpdateVersionsRepo task in the build until the buildtools gets updated to a new NuGet compatible with the CLI. 2017-06-14 20:47:55 -07:00
Livar
fbf9fd1abf Merge pull request #6874 from emgarten/emgarten/nuget4168-1.1.0
Updating NuGet to 4.3.0-preview3-4168 for rel/1.1.0
2017-06-14 17:48:38 -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
Justin Emgarten
8da0d8d27b Updating NuGet to 4.3.0-preview3-4168 2017-06-14 12:10:54 -07:00
Rainer Sigwald
061a87fc82 MSBuild 15.3.388 2017-06-14 10:29:49 -05:00
Rainer Sigwald
1abb96271e MSBuild 15.3.388 2017-06-14 10:28:27 -05:00
Livar Cunha
0a4a0a082c Updating the SDK. Mostly, had to change PackageTargetFallback to AssetTargetFallback. 2017-06-14 00:27:26 -07:00
John Beisner
c497bf498f Write a 'latest.coherent.version' file at blob storage so users have a 'coherent' option to SDK installations. 2017-06-13 16:45:29 -07:00
William Li
a01ab8f362 Fix Debian VSTS/packing failure
One place missing replacement of OsName => HostOsName. But the root cause is
$(HostOSName)' == 'ubuntu' OR '$(HostOSName)' == 'debian' is duplicated too
much.

Extract IsDebianBaseDistro for it
2017-06-13 15:18:05 -07:00
William Li
3419a87d6f Produce RPM packages
Reference from https://github.com/dotnet/core-setup/tree/master/src/pkg/packaging/rpm

The goal is to have parity with Debian,
but does not publish to the feed

When run the script with rhel, it will
produce rpm file in the package step
and publish rpm to the blob storage
2017-06-13 15:00:35 -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 Cunha
a8a86c7747 Updating the signing project to reflect the new location of the resolver. 2017-06-11 20:54:18 -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
d1d5743cc7 Another update to MSBuild. To 15.3.0-preview-000385-01. 2017-06-11 00:11:13 -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
79a57990ff Don't include .NET Core MS.NET.Build.Extensions tasks for .NET Framework and vice versa 2017-06-09 18:58:53 -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
00c5872009 Updating MSBuild to 15.3.0-preview-000384-01 2017-06-09 15:33:57 -07:00
Livar
aa712fb02e Update MSBuild to 15.3.0-preview-000384-01 2017-06-09 15:32:59 -07:00
Ankit Mishra
49ebc73ffc Changing NuGet version to Preview3-4154 2017-06-09 12:39:10 -07:00
Ankit Mishra
dfe5a06818 Updating NuGet version to Preview3-4154 2017-06-09 12:01:21 -07:00
Daniel Plaisted
9cd4e5a956 Add Microsoft.NET.Build.Extensions files to package for VS insertion 2017-06-09 11:18:46 -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
f44cbdfb34 Merge pull request #6799 from wli3/dev/wul/remove-rid-specific
Make deb package has linux-x64 content
2017-06-08 22:53:55 -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