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

2527 commits

Author SHA1 Message Date
Eric Erhardt
55eb812664 Port #4403 back into the main source code. 
This change was lost when we converted the MSBuild "run3" verb to just "run".

Fix #6076
 2017-03-21 13:46:08 -05:00
Livar
1574349a59 Merge pull request #5875 from dotnet/mairaw-patch-1 
Fix misleading string for dotnet add package
 2017-03-16 19:55:33 -07:00
Maira Wenzel
1ee9529203 reverted SpecifyExactlyOnePackageReference string 2017-03-16 16:10:48 -07:00
Livar
5476ad9cf8 Merge pull request #6053 from smadala/tp-redist-02 
Netcoreapp2.0 targetted TestPlatform
 2017-03-16 14:56:23 -07:00
Satya Madala
1f886632f2 remove NetCore10Assemblies renaming back 2017-03-17 00:20:40 +05:30
Maira Wenzel
9b06921b75 addressed feedback 2017-03-16 10:59:33 -07:00
Satya Madala
d95f599028 Remove unavailable netcore10 assemblies 2017-03-16 21:58:49 +05:30
Livar
d347e2781d Merge pull request #5922 from blackdwarf/helpadd 
Add dotnet help <verb> support
 2017-03-15 22:00:00 -07:00
blackdwarf
30a872bd80 Responding to PR feedback 2017-03-15 09:51:07 -07:00
Zlatko Knezevic
d251734170 Responding to PR feedback 2017-03-15 09:37:28 -07:00
Livar
ee9ba91e85 Merge pull request #6030 from nj/readme_environment_var 
Change name for DOTNET_PACKAGES to NUGET_PACKAGES
 2017-03-14 18:19:41 -07:00
Nikolaj Jørgensen
cacd52fdbb Change name for DOTNET_PACKAGES to NUGET_PACKAGES 
README was never updated in #817, making it show an obsolete variable.

This reflects the name used in the current code
 2017-03-14 10:55:29 +01:00
Zlatko Knezevic
36e3d5d2f9 Removing locale from the commented links 2017-03-13 20:56:42 -07:00
Zlatko Knezevic
fa98674954 Responding to PR feedback 2017-03-13 19:42:30 -07:00
Zbyněk Sailer
ddd27248b1 LOC CHECKIN | dotnet/cli | 20170313 | bugfix 2017-03-13 14:24:31 +01:00
Eric Erhardt
b019f4e53d Remove unused constants. 
These strings were used in the project.json days, but are no longer used.
 2017-03-10 17:35:17 -06:00
Livar
374f9ebcee Merge pull request #5979 from dotnet-bot/master-UpdateDependencies 
Update CoreSetup to beta-001711 (master)
 2017-03-09 18:42:08 -08:00
Eric Erhardt
35e3d69a2f Update ProjectJsonMigration's Roslyn 
Now that Roslyn is no longer in the Shared Framework, it doesn't make sense to keep using 1.3.0.  Instead, we should use the same Roslyn version that we use for csc.
 2017-03-09 16:35:08 -06:00
Justin Goshi
c35dbd9563 Migration of xproj with name different from folder leaves ref to old project in solution (#5958) 
* WIP trying to remove unused xproj files

* Use relative path

* Add a test

* Fix a few test failures

* Fix path issue

* Address PR Comments
 2017-03-09 12:17:18 -10:00
Rama Krishnan Raghupathy
7e0010c57f display exception as error 2017-03-08 15:12:50 -08:00
Eric Erhardt
f0e156d384 Merge pull request #5942 from ramarag/mult_Ver 
Cache accepting multiple input files
 2017-03-07 17:44:23 -06:00
Rama Krishnan Raghupathy
ed1ca04f51 Enabling multifile support for cache 2017-03-07 14:38:07 -08:00
Zlatko Knezevic
4da96e1ace Responding to PR feedback 2017-03-05 21:06:43 -08:00
blackdwarf
4aacb22993 Add support for dotnet help <verb> 
This commit adds supports for getting more detailed help by using the
`dotnet help <verb>` syntax (e.g. `dotnet help build`). This change
opens up the URL that is specified for each verb in the default browser
on the user's machine, so internet access is required.
 2017-03-04 19:19:39 -08:00
Livar
b42697ff09 Merge pull request #5917 from eerhardt/FixVersionsRepoUpdater 
Fix UpdateVersionsRepo to always write the files correctly.
 2017-03-03 20:31:05 -08:00
Eric Erhardt
21471aa956 Fix UpdateVersionsRepo to always write the files correctly. 
We were only building nupkgs on windows, which meant if a non-windows machine was the last leg to finish, we were writing a blank file to the versions repo.

Fix #4399
 2017-03-03 21:43:38 -06:00
Eric Erhardt
0e0b59f910 Merge pull request #5909 from dotnet/UpdateSDK 
Update NET.Sdk to 1.1.0-alpha-20170303-2
 2017-03-03 19:56:16 -06:00
Rama Krishnan Raghupathy
99301d0d95 fix cache test 2017-03-03 16:59:12 -08:00
Piotr Puszkiewicz
a07ebe2e7b Merge remote-tracking branch 'refs/remotes/dotnet/master' 
Conflicts:
	TestAssets/DesktopTestProjects/AppWithProjTool2Fx/App.csproj
	TestAssets/NonRestoredTestProjects/AppThrowingException/App/AppThrowingException.csproj
	TestAssets/NonRestoredTestProjects/AppThrowingException/AppDependingOnOtherAsTool/AppDependingOnOtherAsTool.csproj
	TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/EmptyItemGroup/EmptyItemGroup.csproj
	TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/Lib/Lib.csproj
	TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/MoreThanOne/a.csproj
	TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/MoreThanOne/b.csproj
	TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/Net452AndNetCoreApp10Lib/Net452AndNetCoreApp10Lib.csproj
	TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/Net45Lib/Net45Lib.csproj
	TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/ValidRef/ValidRef.csproj
	TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/WithDoubledRef/WithDoubledRef.csproj
	TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/WithExistingRefCondOnItem/WithExistingRefCondOnItem.csproj
	TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/WithExistingRefCondWhitespaces/WithExistingRefCondWhitespaces.csproj
	TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/WithRefCondNonUniform/WithRefCondNonUniform.csproj
	TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/WithRefNoCondNonUniform/WithRefNoCondNonUniform.csproj
	TestAssets/NonRestoredTestProjects/ToolWithRandomPackageName/AppWithDepOnTool/AppWithDepOnTool.csproj
	TestAssets/TestPackages/dotnet-dependency-context-test/dotnet-dependency-context-test.csproj
	TestAssets/TestPackages/dotnet-dependency-tool-invoker/dotnet-dependency-tool-invoker.csproj
	TestAssets/TestPackages/dotnet-portable/dotnet-portable.csproj
	TestAssets/TestProjects/AppWithDepOnToolWithOutputName/AppWithDepOnToolWithOutputName.csproj
	TestAssets/TestProjects/AppWithDirectDepWithOutputName/AppWithDirectDepWithOutputName.csproj
	TestAssets/TestProjects/AppWithMultipleFxAndTools/MSBuildAppWithMultipleFrameworksAndTools.csproj
	TestAssets/TestProjects/AppWithToolDependency/AppWithToolDependency.csproj
	TestAssets/TestProjects/DependencyContextFromTool/DependencyContextFromTool.csproj
	TestAssets/TestProjects/MSBuildAppWithMultipleFrameworks/MSBuildAppWithMultipleFrameworks.csproj
	TestAssets/TestProjects/MSBuildAppWithMultipleFrameworksAndTools/MSBuildAppWithMultipleFrameworksAndTools.csproj
	TestAssets/TestProjects/TestAppSimple/TestAppSimple.csproj
	TestAssets/TestProjects/TestAppWithProjDepTool/TestAppWithProjDepTool.csproj
	TestAssets/TestProjects/VSTestDesktopAndNetCore/VSTestDesktopAndNetCore.csproj
	TestAssets/TestProjects/VSTestDotNetCore/VSTestDotNetCore.csproj
	TestAssets/TestProjects/VSTestXunitDesktopAndNetCore/VSTestXunitDesktopAndNetCore.csproj
	TestAssets/TestProjects/VSTestXunitDotNetCore/VSTestXunitDotNetCore.csproj
	build_projects/Microsoft.DotNet.Cli.Build.Framework/Microsoft.DotNet.Cli.Build.Framework.csproj
	build_projects/dotnet-cli-build/dotnet-cli-build.csproj
	build_projects/shared-build-targets-utils/shared-build-targets-utils.csproj
	test/Microsoft.DotNet.ProjectJsonMigration.Tests/Rules/GivenThatIWantToMigrateConfigurations.cs
	test/Microsoft.DotNet.ProjectJsonMigration.Tests/Rules/GivenThatIWantToMigrateTFMs.cs
 2017-03-02 23:49:01 -08:00
Livar Cunha
103833fd34 Updating the version of the TestFramework which fixed the tests for dotnet test and vstest and actually managed to move the projects used there to 2.0. So, only test packages should remain 1.0. 2017-03-02 21:43:06 -08:00
Piotr Puszkiewicz
d55a8f8188 Add missing copyright headers to all cs files 2017-03-02 21:04:03 -08:00
Piotr Puszkiewicz
841846f32b Standardize on newline between Property|ItemGroup areas 2017-03-02 20:38:56 -08:00
Piotr Puszkiewicz
e617376bc7 Trailing newlines + standardize tabs -> spaces 2017-03-02 20:35:20 -08:00
Piotr Puszkiewicz
d9a06ba95c Remove unnecessary Release constants 
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
    <DefineConstants>$(DefineConstants);RELEASE</DefineConstants>
  </PropertyGroup>
 2017-03-02 20:11:21 -08:00
Piotr Puszkiewicz
78cf9a2941 Version as Metadata in src/ 2017-03-02 19:49:30 -08:00
Maira Wenzel
8a0dd7aece Merge branch 'master' into mairaw-patch-1 2017-03-02 10:52:55 -08:00
Livar Cunha
3a9525b5ac Merge branch 'rel/1.0.1' into merge_rel101_into_master 
* rel/1.0.1: (66 commits)
  Update LZMA license with correct text
  Bump to 2.0.0-rc5-61427-04
  Remove duplicate installer suffix
  Add license text to LZMA SDK license notice
  Updating the SDK to 1.0.0-alpha-20170224-6
  Updating both platform abstractions and dependency model to 1.0.3.
  Bump Roslyn to 2.0.0-rc5-61424-02
  Update Stage0 to use the latest build.
  Update README with new distros.
  Back porting #5597 into rel/1.0.0
  Fixing the exclude pattern used by the Migration to exclude WEB SDK globs.
  Remove RID from test package creation
  Disable migrate and publish web app with content because CI does not have NPM
  Adding an E2E test for pack with content during migration.
  Fixing a failing test and adding a few more E2E tests around binplace content for migrated projects.
  Fix debian_config.json on ubuntu16.10
  Updating publish, pack and build of content to use None with Never/false/Never in their metadata for excluded items.
  Intermediate commit to get a WIP PR out. This adds the None Update with CopyToOutputDirectory set to Never.
  Switching the CopyToOutput for build and publish and the file for pack to use None Update instead of include. Also, fixed the exclude patterns for web apps.
  Do not migrate Content that is already included in the Web SDK for web apps.
  ...
 2017-03-01 20:50:42 -08:00
Livar Cunha
a9a986c30c Merge branch 'rel/1.0.0' into merge_rel_1_0_0_into_rel_1_0_1 
* rel/1.0.0:
  Update LZMA license with correct text
  Add license text to LZMA SDK license notice
 2017-03-01 11:56:37 -08:00
Piotr Puszkiewicz
85ca206d84 Merge pull request #5879 from dotnet/piotrpMSFT/infra/reduceRedist 
Remove unnecessary P2P's from redist.csproj
 2017-03-01 10:13:59 -08:00
Piotr Puszkiewicz
65f6424ddf symbols sdk 2017-03-01 01:24:07 -08:00
Piotr Puszkiewicz
5f4ef8ff77 Remove unnecessary P2P's from redist.csproj 2017-03-01 01:08:33 -08:00
Piotr Puszkiewicz
eb09b62236 Because ; 2017-03-01 00:46:13 -08:00
Piotr Puszkiewicz
12fde69e86 Move remaining Publish actions to redist.csproj 2017-03-01 00:45:02 -08:00
Piotr Puszkiewicz
7bdd7befd8 Merge resolution 2017-03-01 00:45:02 -08:00
Piotr Puszkiewicz
eee7c7ed32 Move PDB removal to redist.csproj target 2017-03-01 00:45:02 -08:00
Piotr Puszkiewicz
283a80dff0 Move Symbols package creation to redist target 2017-03-01 00:45:02 -08:00
Piotr Puszkiewicz
28d83da782 Remove vbc in a target 2017-03-01 00:45:02 -08:00
Piotr Puszkiewicz
a1d27b6843 Merge pull request #5741 from spboyer/master 
Update help text for dotnet-add-package
 2017-03-01 00:36:57 -08:00
Piotr Puszkiewicz
db35770913 Add back Windows condition 2017-02-28 19:30:43 -08:00
Piotr Puszkiewicz
3682882be4 Make RunCsc.sh executable 2017-02-28 19:13:00 -08:00