mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
6748 commits 41 branches 190 tags 95 MiB
Commit graph

6748 commits

This branch
This branch
All branches
Author SHA1 Message Date
Mike Lorbetske
cfd158c6d4 Update to SetupCrossgen 186 - Coherence 25661 2017-06-12 17:58:03 -07:00
Nick Guerrera
f09124fcd6 Make dotnet.Tests pass on localized setup 2017-06-12 17:31:40 -07:00
Livar
fdf3ab9384 Merge pull request #6833 from dotnet/merges/rel/1.1.0-to-release/2.0.0-20170612-070039 
Merge rel/1.1.0 to release/2.0.0
 2017-06-12 15:14:37 -07:00
Nick Guerrera
a2a33591ce Merge branch 'release/2.0.0' into loc 2017-06-12 15:06:54 -07:00
Livar Cunha
36957bfd9b Merge remote-tracking branch 'dotnet/rel/1.1.0' into merges/rel/1.1.0-to-release/2.0.0-20170612-070039 
* dotnet/rel/1.1.0:
  Another update to MSBuild. To 15.3.0-preview-000385-01.
  Updating MSBuild to 15.3.0-preview-000384-01
  Changing NuGet version to Preview3-4154
  Updating the 1.1.0 branding to preview1, from rc4, which we inherited from 1.0 when we branched. And updating the SDK version.
  MSBuild 15.3.378
  Updating NuGet to 4.3.0-preview3-4146
  Add restore force option
  Fixing test failure.
  Updated NuGet version for VS 15.3 preview3 release
 2017-06-12 14:19:35 -07:00
Livar
979a37bbe8 Merge pull request #6824 from dotnet/livarcocc-patch-2 
Updating MSBuild to 15.3.0-preview-000384-01 in 1.1.0
 2017-06-12 12:13:45 -07:00
John Beisner
b92c63c4d3 Fixing a conditional. 2017-06-12 09:38:02 -07:00
John Beisner
5eae1a3a31 Fixing logic; variable name. 2017-06-12 09:31:09 -07:00
Livar
9010dfe035 Merge pull request #6832 from dotnet/fix_resolver_signing 
Updating the signing project to reflect the new location of the resolver.
 2017-06-11 22:41:21 -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
3ea6a6e672 Merge pull request #6816 from enricosada/fsharp_e2e 
add more f# tests
 2017-06-11 18:59:18 -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
6b32a546a1 Merge pull request #6825 from mlorbetske/dev/mlorbe/UpdateToSetupCrossgen183Coherence25615 
Update to SetupCrossgen 183 - Coherence 25615
 2017-06-11 00:12:01 -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
Livar
6d39753044 Merge pull request #6822 from mishra14/rel/1.1.0-updatenuget 
Updating NuGet version to Preview3-4154 in Rel/1.1.0
 2017-06-09 15:25:49 -07:00
Livar
eb92213064 Merge pull request #6819 from mishra14/release/2.0.0-updatenuget 
Updating NuGet version to Preview3-4154
 2017-06-09 15:25:40 -07:00
Enrico Sada
00eadc6e8f test pack command 2017-06-09 23:09:21 +02: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
John Beisner
cd753db228 Default channel=LTS 
Clarify nomenclature from "alternate" to "legacy"
Skip construction of legacy URL if it's flawed.
 2017-06-09 12:00:29 -07:00
Daniel Plaisted
9cd4e5a956 Add Microsoft.NET.Build.Extensions files to package for VS insertion 2017-06-09 11:18:46 -07:00
Enrico Sada
56d03c10e6 reenable smoke test of F# templates 2017-06-09 20:07:33 +02:00
Nick Guerrera
bbdbbb3e8d Update XLF 2017-06-09 10:38:28 -07:00
Nick Guerrera
31c5294ef5 Merge branch 'release/2.0.0' into loc 2017-06-09 10:30:29 -07:00
Enrico Sada
e2520d8df1 empty commit 2017-06-09 18:47:34 +02:00
Daniel Plaisted
07b93e9d7c Merge pull request #6794 from dsplaisted/6737-Include-Build-Extensions 
Add Microsoft.NET.Build.Extensions and corresponding DLLs in CLI layout
 2017-06-09 08:24:47 -07:00
Daniel Plaisted
6b44f8938b Merge upstream changes 2017-06-09 00:43:29 -07:00
Daniel Plaisted
858e443b1e Don't try to CrossGen .NET Framework support DLLs 2017-06-09 00:38:36 -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
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
Livar
6f24b97333 Merge pull request #6808 from mlorbetske/dev/mlorbe/UpdateTemplatesToFixWebAuthScenarios 
Update to template build 256 to fix Web Auth scenarios
 2017-06-08 20:32:42 -07:00
Livar
90093ce408 Merge pull request #6807 from livarcocc/fix_test_runtime 
Updating the vstest.console to use the same runtime that is shipping with the CLI.
 2017-06-08 18:23:03 -07:00
Livar Cunha
253a6c5add Turning off implicit restore when publishing the build project. 2017-06-08 17:00:01 -07:00
Livar Cunha
0b19d6889e Updating the vstest.console to use the same runtime that is shipping with the CLI. 2017-06-08 16:45:29 -07:00
Mike Lorbetske
0e0c31a6c4 Update to template build 256 to fix Web Auth scenarios 2017-06-08 16:26:09 -07:00
Daniel Plaisted
c19ff8cc13 Add test for consuming .NET Standard 2.0 library from .NET Framework 4.6.1 project 2017-06-08 15:40:22 -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
jbeisner
1b2c0cffc0 Merge pull request #6785 from johnbeisner/PackageRename 
.NET Core 2+ Naming and Versioning follow-up; Part 2
 2017-06-08 14:51:46 -07:00
Daniel Plaisted
bc24634f8c Add comment clarifying why net* folders from Microsoft.NET.Build.Extensions package are excluded 2017-06-08 13:33:17 -07:00
Livar
af1f75958a Merge pull request #6797 from livarcocc/update_branding_and_sdk 
Updating the 1.1.0 branding to preview1 from rc4
 2017-06-08 11:39:51 -07:00