Commit graph

6633 commits

Author SHA1 Message Date
Luke Latham
1eefa2beb2 Update first time welcome message 2017-07-21 23:26:15 -05:00
Livar
5c67b11d62 Merge pull request #7014 from dotnet/merges/release/2.0.0-to-master-20170628-070032
Merge release/2.0.0 to master
2017-06-28 10:29:31 -07:00
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
Nick Guerrera
0353374f10 Merge pull request #7006 from nguerrera/command-line-parser
Use latest command line parser
2017-06-27 15:46:43 -07:00
Livar
55198d7199 Merge pull request #7008 from dotnet/merges/release/2.0.0-to-master-20170627-070029
Merge release/2.0.0 to master
2017-06-27 15:37:54 -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
7c928a9f18 Update Microsoft.NET.SDK to 2.0.0-preview3-20170622-1 2017-06-27 14:27:20 -07:00
Nick Guerrera
a115df9543 Adjust help message test expectations to match new parser 2017-06-27 10:03:54 -07:00
Nick Guerrera
34d0900a34 Use latest command line parser 2017-06-27 10:03:53 -07:00
Livar
91ae618d6c Merge pull request #6983 from livarcocc/pay_for_play_loc
Pay for play loc
2017-06-27 08:48:39 -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
262c9d9a12 Merge pull request #7005 from livarcocc/merge_release200_preview2_into_release_200
Merge release200 preview2 into release 200
2017-06-26 16:31:05 -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
Livar
7af62e423e Merge pull request #6999 from livarcocc/first_run_sentinel_when_no_dotnet_folder_exists
Create the Dotnet User Profile folder when running the first experience
2017-06-26 12:53:02 -07:00
Livar
eeddfb6ea1 Merge pull request #7001 from dotnet/merges/release/2.0.0-to-master-20170626-070030
Merge release/2.0.0 to master
2017-06-26 11:25:58 -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
Livar
c7959b942c Merge pull request #6990 from dotnet/merges/rel/1.1.0-to-release/2.0.0-20170623-070039
Merge rel/1.1.0 to release/2.0.0
2017-06-24 23:01:06 -07:00
Livar Cunha
cd984f5b50 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. 2017-06-24 22:59:35 -07:00
Eric Erhardt
f520b8a945 Merge pull request #6992 from eerhardt/ReenableUpdateVersionsRepo
Reenable UpdateVersionsRepo
2017-06-24 19:51:02 -05:00
Livar
58903255eb Merge pull request #6991 from dotnet/merges/release/2.0.0-to-master-20170623-070040
Merge release/2.0.0 to master
2017-06-24 15:58:34 -07:00
Livar
0b46c9b5b3 Merge pull request #6993 from livarcocc/run_non_project_file_error
Dotnet run handles non-valid file
2017-06-24 15:57:57 -07:00
Nick Guerrera
14977b7201 Add F# and Roslyn satellites 2017-06-23 19:48:38 -07:00
Nick Guerrera
162d620038 Fix tests expecting unlocalized messages from dotnet/sdk 2017-06-23 19:48:07 -07:00
William Li
10d59cd982 Merge branch 'master' into merges/release/2.0.0-to-master-20170623-070040 2017-06-23 11:32:24 -07:00
Livar Cunha
425100ebf8 Merge remote-tracking branch 'dotnet/rel/1.1.0' into merges/rel/1.1.0-to-release/2.0.0-20170623-070039
* dotnet/rel/1.1.0:
  MSBuild 15.3.400
2017-06-23 10:52:19 -07:00
Livar Cunha
37f531be4c Handling an exception that happens when dotnet run is invoked with a file that is not a valid project file. We catch that exception and re-throw it as a GracefulException. 2017-06-23 10:47:09 -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
Nick Guerrera
07dfded669 Merge pull request #6988 from dotnet/stevesa/update-spa-templates-to-1.0.0-preview-000321
Update SPA templates version to 1.0.0-preview-000321
2017-06-22 14:34:11 -07: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
William Li
f4d884a03d Add dummy eula for Windows installer 2017-06-22 09:03:35 -07:00
William Li
ff9b8838f5 Update Mac installer
According to https://github.com/dotnet/cli/issues/6682
Window title
Update Introduction step content
Include installation location and list of all components installed
Update Summary step content

What is not included:
Remove "Welcome to ..." text -- it come from the installer tool
itself, it cannot be customized
Add 'success' graphic – cannot include picture in the html used by
the installer
2017-06-22 09:03:35 -07:00
Steve Sanderson
6ef4086946 Update SPA templates version to 1.0.0-preview-000321 2017-06-22 16:52:00 +01:00
Livar
934356b7d5 Merge pull request #6982 from KevinRansom/release/2.0.0-preview2
Fix dotnet/sdk#1364
2017-06-21 19:24:19 -07:00
Nick Guerrera
1ad0e4dffa Merge pull request #6974 from nguerrera/msbuild-satellites
Add msbuild satellite assemblies
2017-06-21 18:03:25 -07:00
Nick Guerrera
12f4ab563d Merge pull request #6980 from rainersigwald/msbuild-15.3.400-for-1.1
MSBuild 15.3.400
2017-06-21 18:03:08 -07:00
Nick Guerrera
c91e89b618 Merge pull request #6979 from rainersigwald/msbuild-15.3.400
MSBuild 15.3.400
2017-06-21 18:02:45 -07:00
Kevin Ransom
78309e52fa Fix dotnet/sdk#1364 2017-06-21 17:43:43 -07:00
Nick Guerrera
3620a7b663 Merge pull request #6973 from nguerrera/loc-tests
Make configurer unit tests pass on localized setup
2017-06-21 16:32:29 -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
9b5aa3843d Merge pull request #6963 from dotnet/merges/rel/1.1.0-to-release/2.0.0-20170621-070038
Merge rel/1.1.0 to release/2.0.0
2017-06-21 13:57:05 -07:00
Nick Guerrera
74acc40036 Add msbuild satellite assemblies 2017-06-21 13:34:16 -07:00
Nick Guerrera
6b0cd0e52f Make configurer unit tests pass on localized setup 2017-06-21 12:44:34 -07:00
William Li
a5698110a2 Add rhel and Debian download link 2017-06-21 12:13:15 -07:00
Nick Guerrera
1661fd0975 Merge pull request #6961 from nguerrera/loc-tests
Make remaining tests pass on localized setup
2017-06-21 10:42:01 -07:00
Livar
3471d43796 Merge pull request #6964 from dotnet/merges/release/2.0.0-to-master-20170621-070039
Merge release/2.0.0 to master
2017-06-21 10:02:32 -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
Livar Cunha
cb1a2996f1 Merge remote-tracking branch 'dotnet/rel/1.1.0' into merges/rel/1.1.0-to-release/2.0.0-20170621-070038
* dotnet/rel/1.1.0:
  Add symreader-native myget feed
  Upgrade DiaSymReader.Native to 1.6.0-beta2-25304
  Updating Roslyn to 2.3.0-beta3-61816-04
2017-06-21 08:49:31 -07:00