Rama Krishnan Raghupathy
|
ed1ca04f51
|
Enabling multifile support for cache
|
2017-03-07 14:38:07 -08: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 |
|
Rama Krishnan Raghupathy
|
94dab4559a
|
Merge remote-tracking branch 'upstream/master' into UpdateSDK
|
2017-03-03 14:27:05 -08:00 |
|
Livar
|
70c65160f6
|
Merge pull request #5892 from livarcocc/merge_rel101_into_master
Merge rel101 into master
|
2017-03-03 14:11:06 -08:00 |
|
Livar
|
1f536a11a0
|
Merge pull request #5913 from dotnet/update-msbuild-and-nuget
Update versions of MSBuild and NuGet
|
2017-03-03 13:50:14 -08:00 |
|
Parallels
|
a5c7ac12f7
|
Fixing a couple more merge issues regarding deb generation.
|
2017-03-03 13:30:57 -08:00 |
|
Piotr Puszkiewicz
|
a9ba12921b
|
Merge pull request #5889 from dotnet/dev/jgoshi/updateDotnetInstallScript
Update the install script to support osname
|
2017-03-03 12:49:58 -08:00 |
|
Daniel Plaisted
|
4b9c4efc3f
|
Update versions of MSBuild and NuGet
|
2017-03-03 12:33:56 -08:00 |
|
Parallels
|
f42599dec2
|
Fixing ubuntu deb generation.
|
2017-03-03 11:13:41 -08:00 |
|
Piotr Puszkiewicz
|
5eeb3c04fd
|
Merge pull request #5766 from dotnet/blackdwarf-patch-1
Update cli-installation-scenarios.md
|
2017-03-03 11:13:05 -08:00 |
|
Justin Goshi
|
a66ef9f0ef
|
Fix spacing
|
2017-03-03 11:05:13 -08:00 |
|
Justin Goshi
|
cdf85ec1d2
|
Update the descriptino
|
2017-03-03 11:02:09 -08:00 |
|
Justin Goshi
|
e21c1a4a98
|
Change the command line argument per PR comments
|
2017-03-03 09:25:31 -08:00 |
|
Justin Goshi
|
18169e1c6a
|
Merge branch 'master' into dev/jgoshi/updateDotnetInstallScript
|
2017-03-03 09:12:29 -08:00 |
|
Eric Erhardt
|
7fca740af5
|
Update NET.Sdk to 1.1.0-alpha-20170303-2
|
2017-03-03 10:11:30 -06:00 |
|
Livar Cunha
|
ecdf6419fb
|
Merge branch 'merge_rel101_into_master' of github.com:livarcocc/cli-1 into merge_rel101_into_master
* 'merge_rel101_into_master' of github.com:livarcocc/cli-1:
Merge issues
|
2017-03-03 01:09:23 -08:00 |
|
Livar Cunha
|
c667ec7702
|
Fixing a bad merge on Installer.DEB.proj.
|
2017-03-03 01:08:58 -08:00 |
|
Piotr Puszkiewicz
|
5fe182e038
|
Merge issues
|
2017-03-03 00:36:11 -08:00 |
|
Livar Cunha
|
89b2785b74
|
Undoing a change that apparently broke the tests.
|
2017-03-03 00:20:17 -08:00 |
|
Piotr Puszkiewicz
|
e8d805ee1e
|
Merge remote-tracking branch 'refs/remotes/livarcocc/merge_rel101_into_master'
Conflicts:
TestAssets/TestPackages/dotnet-dependency-tool-invoker/dotnet-dependency-tool-invoker.csproj
TestAssets/TestPackages/dotnet-desktop-and-portable/dotnet-desktop-and-portable.csproj
TestAssets/TestPackages/dotnet-portable/dotnet-portable.csproj
|
2017-03-02 23:50:15 -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
|
a97010d589
|
Fixing windows tests. I was missing the RuntimeFrameworkVersion in a desktop project, which meant that the metapackage version was being inferred as 2.0, which does not exist yet.
|
2017-03-02 23:48:26 -08:00 |
|
Livar Cunha
|
d20a1d4e2e
|
Fixing failing test.
|
2017-03-02 23:43:06 -08:00 |
|
Piotr Puszkiewicz
|
cc80822c16
|
Merge pull request #5906 from piotrpMSFT/piotrpMSFT/infra/CodeCleanup
Code Cleanup
|
2017-03-02 23:26:28 -08:00 |
|
Piotr Puszkiewicz
|
ef23038dcd
|
Yet more fixups
|
2017-03-02 22:35:24 -08:00 |
|
Piotr Puszkiewicz
|
5048f65703
|
Merged branch master into piotrpMSFT/infra/CodeCleanup
|
2017-03-02 21:56:50 -08:00 |
|
Piotr Puszkiewicz
|
db90fb2796
|
More Fixups
|
2017-03-02 21:56:44 -08:00 |
|
Livar
|
a47cce6150
|
Merge pull request #5905 from piotrpMSFT/piotrpMSFT/infra/TasklessGitInfo
Remove task usage in commitcount & hash calculation
|
2017-03-02 21:44:25 -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
|
23396bdb8f
|
Fixups
|
2017-03-02 21:33:29 -08:00 |
|
Piotr Puszkiewicz
|
d55a8f8188
|
Add missing copyright headers to all cs files
|
2017-03-02 21:04:03 -08:00 |
|
Piotr Puszkiewicz
|
bc5a53ed35
|
Fix excessive removals
|
2017-03-02 20:51: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
|
d847963ab7
|
Fix bad updates
|
2017-03-02 20:09:37 -08:00 |
|
Piotr Puszkiewicz
|
c56ef29300
|
Remove remaining unnecessary P2P's
|
2017-03-02 20:05:12 -08:00 |
|
Piotr Puszkiewicz
|
19e486bcb2
|
Version as Metadata in TestAssets
|
2017-03-02 19:52:26 -08:00 |
|
Piotr Puszkiewicz
|
a5862752c9
|
Version as Metadata in build/
|
2017-03-02 19:50:46 -08:00 |
|
Piotr Puszkiewicz
|
f39eeaf1c3
|
Version as Metadata in build_projects/
|
2017-03-02 19:50:19 -08:00 |
|
Piotr Puszkiewicz
|
78cf9a2941
|
Version as Metadata in src/
|
2017-03-02 19:49:30 -08:00 |
|
Piotr Puszkiewicz
|
b62dd924f8
|
Version as Metadata in remaining test projects
|
2017-03-02 19:45:55 -08:00 |
|
Piotr Puszkiewicz
|
75c49aaf1e
|
Version as Metadata in dotnet-sln-add.Tests
|
2017-03-02 19:45:12 -08:00 |
|
Piotr Puszkiewicz
|
eb811e9a48
|
Version as Metadata in dotnet-sln-list.Tests
|
2017-03-02 19:44:49 -08:00 |
|
Piotr Puszkiewicz
|
20b9303e94
|
Version as Metadata in dotnet sln remove tests
|
2017-03-02 19:44:35 -08:00 |
|
Piotr Puszkiewicz
|
aeb93edca8
|
Version as Metadata in dotnet-test.Tests
|
2017-03-02 19:44:15 -08:00 |
|
Piotr Puszkiewicz
|
b1be2ab5c5
|
Version as Metadata in dotnet-vstest.Tests
|
2017-03-02 19:44:02 -08:00 |
|
Piotr Puszkiewicz
|
8f2e6b99bf
|
Version as Metadata in dotnet.Tests
|
2017-03-02 19:43:17 -08:00 |
|
Piotr Puszkiewicz
|
7fc2107abb
|
Version as Metadata in msbuild.IntegrationTests
|
2017-03-02 19:42:48 -08:00 |
|