Commit graph

190 commits

Author SHA1 Message Date
Livar
966e133565 Merge branch 'master' into merges/release/15.5-to-master-20171016-070031 2017-10-17 11:36:43 -07:00
Livar
c434233ba5 Adding a note about needing additional feeds
Additional feeds may be necessary when consuming pre-release bits. Added this additional information to the README page of the CLI.
2017-10-16 21:16:43 -07:00
Livar Cunha
e1916cc4dc Merge remote-tracking branch 'dotnet/release/15.5' into merges/release/15.5-to-master-20171016-070031
* dotnet/release/15.5: (21 commits)
  Manually merging some changes that git merged wrong and deleted from the 15.5 branch.
  Separating the 'legacy' URL construction from the 'current' URL construction methods and logic.
  Use temporary path for fake deps.json in test
  Use same build number for roslyn and F# satellites
  Updating Roslyn satellites and SDK versions
  Insert NuGet Build 4.5.0-preview2-4529 into cli
  Update NuGet to 4529 (signed)
  MSBuild 15.5.154
  MSBuild 15.5.153
  removed commented out config I'd meant to remove
  added a way to specify the asp.net template versions
  Porting 'dotnet-install.sh' from CLI:master to CLI:release/2.0.0
  'NuGet.master.config' does not appear to be used.
  Fixed tests
  Update branch info to release/15.5
  Updating the websdk version to 2.0.0-rel-20171010-665
  Insert NuGet Build 4.5.0-preview1-4526 into cli
  Update DependencyVersions.props
  Updated version of TestPlatform to 15.5.0-preview-20170923-02
  MSBuild 15.4.8
  ...
2017-10-16 15:42:40 -07:00
Daniel Plaisted
857c7e3e56 Update branch info to release/15.5 2017-10-10 22:11:00 -07:00
John Beisner
ddae35eadf Updating the README 2017-10-02 16:47:17 -07:00
Livar Cunha
2669306319 Fixing merges. 2017-09-26 15:33:17 -07:00
Livar Cunha
c7fa050645 Merge branch 'release/2.0-vs' into merge_release20_vs
* release/2.0-vs: (22 commits)
  Insert SDK 2.0.2-vspre-20170921-5
  Insert SDK 2.0.2-vspre-20170915-1
  MSBuild 15.4.7
  Updating the websdk version to 2.0.0-rel-20170908-653
  Insert NuGet Build 4.4.0-preview3-4475 into cli
  Remove out of support ubuntu1610
  Removing extra line feeds...
  Turning on the NuPkg publishing from Win x86
  The enumeration of the nupkg packages depends on that the creation of packages has already occurred.
  Trivial change to start a VSO build
  Push the 'VS.Redist.Common.Net.Core.SDK*.nupkg' packages to blob storage.
  Remove EOL openSuSE 42.1
  Trigger build
  Trigger build
  Sign additional files
  Update CLI_NETSDK_Version SDK to 2.0.2-vspre-20170825-1
  Dummy commit to trigger CI due to 20170824.1 publish nuget time out 20170824.1
  Insert NuGet Build 4.4.0-preview1-4434 into cli
  Update to SDK build which includes NuGet 4.4.0-preview1-4365
  Insert NuGet Build 4.4.0-preview1-4365 into cli
  ...
2017-09-22 15:36:27 -07:00
Roger
653ed5493f Reflect naming of Mac on dot.net site. 2017-09-19 18:59:00 -04:00
John Beisner
558a6efa3b Removing references to "Ubuntu 16.10" 2017-09-07 14:04:25 -07:00
Nick Guerrera
252218c3d0 Merge 'release/2.0.0' into merges/release/2.0.0-to-master-20170901-070026
Conflicts:
	README.md
	build/Branding.props
	build/DependencyVersions.props
	netci.groovy
	test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectToolsCommandResolver.cs
	test/dotnet-new.Tests/GivenThatIWantANewApp.cs
2017-09-01 11:55:26 -07:00
John Beisner
71fe48fa43 Trivial change to start a VSO build 2017-08-30 13:29:17 -07:00
Nick Guerrera
eb6767a7cc Trigger build 2017-08-30 08:31:42 -07:00
Nick Guerrera
0024199cfd Trigger build 2017-08-29 17:19:22 -07:00
Dan Moseley
bf06c22257 Update readme to note 2.0 is released 2017-08-28 21:18:43 -07:00
jbeisner
10e95d890c Merge branch 'release/2.0.0' into patch-1 2017-08-25 10:23:01 -07:00
William Li
4ae52088bf Merge branch 'master' into merges/release/2.0.0-to-master-20170821-070027 2017-08-21 12:54:31 -07:00
Rick Anderson
27a6569ae0 Update README.md (#7217) 2017-08-17 13:19:03 -07:00
Daniel Plaisted
030dfc9945 Update branch in README.md to release/2.0.2 2017-08-16 14:40:06 -07:00
Nick Guerrera
23c05f3305 Update README.md to trigger build 2017-08-04 09:18:06 -07:00
John Beisner
4466b18ec2 Trivial change to start a VSO build run. 2017-07-28 10:20:21 -07:00
John Beisner
e7d5c6891b Updating the build definition URLs. 2017-07-25 12:24:33 -07:00
John Beisner
1c1a6f2981 Trivial change. 2017-07-24 11:49:26 -07:00
John Beisner
68f1e6a9de Changing the 'coherent' badge value. 2017-07-20 11:32:03 -07:00
Livar
1728aef325 Merge branch 'master' into merges/release/2.0.0-to-master-20170718-070024 2017-07-18 15:58:34 -07:00
John Beisner
0f0d87a615 Trivial changes to the readme.md 2017-07-14 12:26:57 -07:00
Livar
a04273474e Merge branch 'master' into merges/release/2.0.0-to-master-20170712-070028 2017-07-12 14:28:17 -07:00
John Beisner
5378b074d9 Updating the VSO build IDs. 2017-07-11 11:51:03 -07:00
John Beisner
1d49d0753a Update 2017-07-10 15:18:15 -07:00
John Beisner
4aef6c7754 Update 2017-07-10 15:15:54 -07:00
John Beisner
4518d1846b Update. 2017-07-10 15:13:40 -07:00
John Beisner
9e743d8730 Updates per code review. 2017-07-10 15:11:19 -07:00
John Beisner
b1e7bc0e8b Updates per code review. 2017-07-10 14:14:10 -07:00
John Beisner
e408719833 Updating the Readme.md; adding references to 'coherent' builds. 2017-07-07 16:04:59 -07:00
Livar Cunha
a5aba4929a Merge remote-tracking branch 'dotnet/release/2.0.0' into merges/release/2.0.0-to-master-20170627-070029
* dotnet/release/2.0.0: (27 commits)
  Updating the runtime to pick up the satellite assembly host fix.
  Fixing some merges from release/2.0.0-preview2.
  Create the Dotnet User Profile folder when running the first experience, if the folder does not exist, if will fail the first run because it will fail to create the first notice sentinel.
  Add F# and Roslyn satellites
  Fix tests expecting unlocalized messages from dotnet/sdk
  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.
  Update SPA templates version to 1.0.0-preview-000321
  Fix dotnet/sdk#1364
  Add rhel and Debian download link
  Exclude satellite assemblies from archive.
  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.
  ...
2017-06-27 14:53:41 -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
Rick Anderson
d308b4a7ec Update README.md 2017-06-23 11:51:11 -07:00
William Li
a5698110a2 Add rhel and Debian download link 2017-06-21 12:13:15 -07:00
Livar Cunha
5cab325335 Merge remote-tracking branch 'dotnet/release/2.0.0' into merges/release/2.0.0-to-master-20170621-070039
* dotnet/release/2.0.0: (35 commits)
  Fixing an issue in the RepoDirectoriesProvider where it assumed that the only directory under SDK was the SDK directories. This is no longer true now that we moved the NuGet fallback folder there.
  Simple clean up to the store tests
  Updating xlf files for the Configurer.
  Removing NuGetConfig from the first run experience and replacing the sentinel with the FirstUseNoticeSentinel when needed.
  Moving the expanding fallback folder to the dotnet folder hive. The folder will be expanded at sdk/NuGetFallbackFolder.
  Fixing CRLF issue.
  Updating xlf and fixing line ending problems with one file.
  Add rhel and Debian download link
  Fix race in telemetry msbuild arg tests
  Avoid repeating the first-run message if lzma archive is missing
  Use fluent helper for line-end normalization
  Update CoreSetup to preview3-25419-01
  Updating Roslyn to 2.3.0-beta3-61816-04
  Update CoreSetup to preview3-25418-01
  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
  Windows installer refresh
  Update SDK to 1.1.0-alpha-20170615-3
  Updating NuGet to 4.3.0-preview3-4168
  MSBuild 15.3.388
  Make dotnet-sln-add.Tests pass on localized setup
  ...
2017-06-21 08:51:19 -07:00
William Li
3348fca85a Add rhel and Debian download link 2017-06-19 16:05:38 -07:00
John Beisner
b3675ca3ec The links at blob storage will change from "release/2.0.0" to "release/2.0.0-preview2" 2017-06-15 15:42:31 -07:00
John Beisner
730719fcb0 Changing two links from explicit to relative. 2017-06-15 15:34:28 -07:00
John Beisner
47988952ac Updating the links in the README; fixing the installation script. 2017-06-15 15:25:41 -07:00
Livar Cunha
8da7efdf41 Merge remote-tracking branch 'dotnet/release/2.0.0' into merges/release/2.0.0-to-master-20170612-070041
* dotnet/release/2.0.0: (72 commits)
  Updating the signing project to reflect the new location of the resolver.
  Another update to MSBuild. To 15.3.0-preview-000385-01.
  Another update to msbuild. To 15.3.0-preview-000385-01.
  Update to SetupCrossgen 183 - Coherence 25615
  Don't include .NET Core MS.NET.Build.Extensions tasks for .NET Framework and vice versa
  Update version of SDK and MS.NET.Build.Extensions, adapt to layout change
  Updating MSBuild to 15.3.0-preview-000384-01
  Update MSBuild to 15.3.0-preview-000384-01
  test pack command
  Changing NuGet version to Preview3-4154
  Updating NuGet version to Preview3-4154
  Add Microsoft.NET.Build.Extensions files to package for VS insertion
  reenable smoke test of F# templates
  empty commit
  Don't try to CrossGen .NET Framework support DLLs
  Update test platform to 15.3.0-preview-20170609-02.
  Turning off implicit restore when publishing the build project.
  Updating the vstest.console to use the same runtime that is shipping with the CLI.
  Update to template build 256 to fix Web Auth scenarios
  Add test for consuming .NET Standard 2.0 library from .NET Framework 4.6.1 project
  ...
2017-06-12 17:23:20 -07:00
John Beisner
0f10cf5973 Updating the links to blob storage. 2017-06-05 16:31:35 -07:00
John Beisner
22cf8ff662 Formatting; part 2... 2017-06-01 14:33:04 -07:00
John Beisner
bd10a090f5 Formating... 2017-06-01 14:29:50 -07:00
John Beisner
641bbd712c Consolidating the Linux tar.gz's 2017-06-01 14:25:12 -07:00
Livar Cunha
ad831a3bdc Merge branch 'release/2.0.0' into merge_release_200_master
* release/2.0.0: (104 commits)
  Updating NuGet.
  Remove redundant error handling from project provider, add a better message for deserialization exceptions
  Temporarily change the runtime deb pkg name to unblock the integration.
  insert new bits of TestPlatform which has bug fixes.
  Add missing using directive
  Only catch JsonException in the method that dispatches to the appropriate handlers
  Shorten names a bit more, make project names match folder names
  Shorten test project names
  Fix flow from the refactoring
  Remove NuGet.Configs, add inversion of the launch profile flag, move profile application logic to its own method
  Make errors more specific, add support for setting the launch URL for ASP.NET apps
  Add missed launch settings, fix NuGet.configs, remove unused packages
  Ad tests, fix issue where profile not found isn't an error
  Initial add of launchSettings.json support
  Update to SetupCrossgen 134 - Coherence 25332
  Fix dotnet-deb-tool path.
  Update dotnet-deb-tool to 2.0.0-preview2-25331-01
  Shorten names a bit more, make project names match folder names
  Shorten test project names
  Re-enable telemetry for new
  ...
2017-06-01 12:53:51 -07:00
John Beisner
17ea7b2d13 The README links at https://github.com/dotnet/cli/tree/release/2.0.0#installers-and-binaries need to be updated 2017-06-01 12:38:51 -07:00