Commit graph

3782 commits

Author SHA1 Message Date
Rohit Agrawal
28bd507f40 update nuget and sdk to 3.6.0-rc-1954 and 1.0.0-alpha-20161006-3 (#4332) 2016-10-06 09:35:58 -07:00
Sridhar Periyasamy
5c6e3a05fb Merge pull request #4305 from dotnet/sridhar-ms/migrate-p2p-fix
Fix P2P migration and migrate folders in global.json
2016-10-05 20:59:39 -07:00
Livar
f24f8c6e62 Merge pull request #4322 from dotnet/sridhar-ms/create-installer-nupkgs
Create a nuget package with the windows installers.
2016-10-05 19:17:57 -07:00
Sridhar Periyasamy
c6064677db Address PR feedback 2016-10-05 17:58:42 -07:00
Bryan Thornbury
80337d802a Merge pull request #4328 from brthor/brthor/remove-lockfile
remove lock file workaround
2016-10-05 17:51:56 -07:00
Bryan Thornbury
d0b28bc7ad remove lock file workaround 2016-10-05 17:02:32 -07:00
Nate McMaster
b38f644347 Merge pull request #4326 from dotnet/namc/user-secrets
Add migration rule for 'userSecretsId'
2016-10-05 16:40:38 -07:00
Sridhar Periyasamy
1d85c241b1 Add support to migrate folders specified in global.json 2016-10-05 16:27:17 -07:00
Sridhar Periyasamy
a396630576 Fix P2P migration
Fixes #4269 by deep cloning the MsbuildTemplateProject for each P2P reference. Add test which migrates and builds P2P references.
2016-10-05 16:25:28 -07:00
Livar
09e8877bd4 Merge pull request #4327 from livarcocc/update_toolsref
Fixing the tools item name in csproj. Nuget used a different one then…
2016-10-05 16:12:13 -07:00
Livar Cunha
bfc1f82d68 Fixing the tools item name in csproj. Nuget used a different one then was originally at the spec. 2016-10-05 15:27:30 -07:00
Nate McMaster
190f0fc756 Rename to MigrateJsonPropertiesRule 2016-10-05 15:15:13 -07:00
Nate McMaster
dd7a76e6f0 Add migration rule for 'userSecretsId' 2016-10-05 15:05:19 -07:00
Bryan Thornbury
6ad5a185cb Merge pull request #4323 from 333fred/XprojNote
Migrate Args update comment
2016-10-05 14:31:24 -07:00
Fredric Silberberg
b2802cdf50
Added comment about updating in VS calls of dotnet migrate when cli args change. 2016-10-05 14:26:20 -07:00
Sridhar Periyasamy
d0e06b9220 Create a nuget package with the windows installers.
These nuget packages are used to deliver the CLI payload to Visual Studio
setup authoring. They are pushed (by VSO build definitions) into an internal feed consumed by
Visual Studio.
2016-10-05 13:56:57 -07:00
Bryan Thornbury
50e83b9c65 Merge pull request #4320 from brthor/brthor/toolsrefmigration
dotnet cli migrate tools ref
2016-10-05 13:39:34 -07:00
Livar
7a0dff8a96 Merge pull request #4300 from livarcocc/support_for_toolsref
Support for toolsref
2016-10-05 13:18:12 -07:00
Livar Cunha
465b32dab4 Addressing code review comments. 2016-10-05 11:51:59 -07:00
Bryan Thornbury
310da80c3a remove write 2016-10-05 11:39:14 -07:00
Bryan Thornbury
1232a38e51 dotnet cli migrate tools ref 2016-10-05 11:36:23 -07:00
Bryan Thornbury
3117e4a686 Merge pull request #4311 from brthor/brthor/keyfile
KeyFile Migration Fixes
2016-10-05 10:46:27 -07:00
Livar Cunha
facbef52ff Changing the code to read tools from csproj because the tools section in assets.json is no longer being populated. 2016-10-04 18:59:44 -07:00
Livar Cunha
1570e0fde4 Moving the ProjectToolsCommandResolver to dotnet out of Cli.Utils because of the dependency on Microsoft.Build. Also added a EndToEnd test for tools ref using the MSBuildTestApp. 2016-10-04 18:59:44 -07:00
Livar Cunha
12e8e8eca7 Temp 2016-10-04 18:58:38 -07:00
Livar Cunha
e5f6107d88 Fixing a test that needed the lock file now that that's what we use for tools. 2016-10-04 18:58:38 -07:00
Livar Cunha
b4b89c7849 Switch to code to generate deps file for tools using the lock file. 2016-10-04 18:58:38 -07:00
Livar Cunha
05472919af Changing the tool resolution to fully use the NuGet file and no longer rely on the project.json file. 2016-10-04 18:58:38 -07:00
Bryan Thornbury
bf5404373f add signed verification test 2016-10-04 16:48:14 -07:00
Bryan Thornbury
3149af8941 remove proejct.migrated.json 2016-10-04 16:40:20 -07:00
Bryan Thornbury
49637d0fe9 pr feedback 2016-10-04 16:37:23 -07:00
Bryan Thornbury
46b16d2de0 fix signing migration 2016-10-04 16:06:45 -07:00
Bryan Thornbury
851ed78605 key 2016-10-04 15:53:14 -07:00
Bryan Thornbury
148008d733 fix key sign 2016-10-04 15:49:35 -07:00
Bryan Thornbury
7632cd3502 Merge pull request #4261 from brthor/brthor/packageref
PackageReference Migration
2016-10-04 14:42:43 -07:00
Bryan Thornbury
21c45de0b7 error preference 2016-10-04 10:45:57 -07:00
Bryan Thornbury
a078e8b845 dir 2016-10-04 10:13:01 -07:00
Eric Erhardt
0b37ad5d52 Merge pull request #4295 from eerhardt/MergePreview2
Merge rel/1.0.0-preview2 into rel/1.0.0
2016-10-04 07:50:31 -05:00
Bryan Thornbury
adff632929 green 2016-10-03 20:10:09 -07:00
Bryan Thornbury
bf45ab19ca PackageReference 2016-10-03 17:12:57 -07:00
Nate Amundson
19f295113a Merge pull request #4234 from naamunds/SupportCustomContainer
Support building with custom container name
2016-10-03 18:02:05 -05:00
Eric Erhardt
cb03b0ef7a Fixing errant file modes from merging 2016-10-03 15:18:20 -05:00
Eric Erhardt
d4d2be5f8c Fix the merge of preview2 to build correctly. 2016-10-03 14:48:33 -05:00
Eric Erhardt
5055935008 Merging rel/1.0.0-preview2 into rel/1.0.0. 2016-10-03 14:47:24 -05:00
Eric Erhardt
79b9f3c22a Merge pull request #4281 from dotnet/CapRIDs
Support developing on new versions of a supported OS
2016-10-03 14:08:45 -05:00
Eric Erhardt
f12f274f81 Merge pull request #4286 from eerhardt/SelfContainedPublish
Add support for publishing self-contained applications.
2016-10-03 13:00:14 -05:00
Eric Erhardt
f065a29704 Rename IsCurrentRuntimeSupported() to SupportsCurrentRuntime(). 2016-10-03 12:45:39 -05:00
Eric Erhardt
79999f3798 Remove temporary test project. 2016-10-03 09:37:15 -05:00
Eric Erhardt
a7366f5864 Add support for publishing self-contained applications.
Fix #4204
2016-10-03 09:23:00 -05:00
Livar
a3a58423d1 Merge pull request #4265 from livarcocc/remove_projetjson_from_msbuild_template
Remove projetjson from msbuild template
2016-09-30 18:55:42 -07:00