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 |
|
Piotr Puszkiewicz
|
d20807b4c1
|
Version as metadata for dotnet-cache tests
|
2017-03-02 19:41:22 -08:00 |
|
Piotr Puszkiewicz
|
e9087b71ca
|
Remove unnecessary P2P's from dotnet-cache tests
|
2017-03-02 19:39:20 -08:00 |
|
Piotr Puszkiewicz
|
09959ab045
|
Version as Metadata for dotnet-build
|
2017-03-02 19:37:46 -08:00 |
|
Piotr Puszkiewicz
|
6de49cdd1c
|
Remove unnecessary P2P's from dotnet-build.Tests
|
2017-03-02 19:26:05 -08:00 |
|
Piotr Puszkiewicz
|
5e4be2b13e
|
Version as metadata AddRef tests
|
2017-03-02 19:25:20 -08:00 |
|
Piotr Puszkiewicz
|
c25b6a70b9
|
Remove Unecessary P2P references from addref tests
|
2017-03-02 19:23:50 -08:00 |
|
Piotr Puszkiewicz
|
40db9678be
|
Version As Attribute in Crossgen tests
|
2017-03-02 19:21:58 -08:00 |
|
Piotr Puszkiewicz
|
cd3a4aa82c
|
Crossgen tests remove unnecessary components
|
2017-03-02 19:19:51 -08:00 |
|
Piotr Puszkiewicz
|
5ca4eec393
|
ArgumentForwardingTests Version As Attribute
|
2017-03-02 19:19:35 -08:00 |
|
Piotr Puszkiewicz
|
6982db1a45
|
Remove unnecessary references from ArgumentForwarding tests
|
2017-03-02 19:13:58 -08:00 |
|
Piotr Puszkiewicz
|
6cf6c45f0e
|
Remove Performance Tests
|
2017-03-02 18:58:47 -08:00 |
|
Piotr Puszkiewicz
|
4a0724e136
|
Merge pull request #5888 from piotrpMSFT/piotrpMSFT/infra/RemoveMigrationDefaultsConstructor
remove migration defaults constructor
|
2017-03-02 18:52:02 -08:00 |
|
Piotr Puszkiewicz
|
958fc85962
|
Merge pull request #5870 from ellismg/make-update-dependencies-idempotent
Make update-dependencies idempotent in the only update case
|
2017-03-02 18:51:31 -08:00 |
|
Piotr Puszkiewicz
|
808e7c5b81
|
Merge pull request #5894 from MichaelSimons/docker-hub-repo
Switch Docker Hub repo being used to microsoft/dotnet-buildtools-prereqs
|
2017-03-02 18:50:27 -08:00 |
|
Piotr Puszkiewicz
|
fbb75e1a47
|
Remove task usage in commitcount calculation
|
2017-03-02 18:46:08 -08:00 |
|
Livar Cunha
|
23e39c10b7
|
Moving as many of our test assets to netcoreapp2.0 as possible. I believe the only ones missing at the test packages, because tools always target 1.0. And the other ones are VSTestDotNetCore and VSTestXUnitDotNetCore, because we can't run tests on 2.0 yet. Or, when I tried it failed. I may came back to try this out later.
|
2017-03-02 17:41:21 -08:00 |
|
Livar
|
314aca0682
|
Merge pull request #5898 from dotnet/piotrpMSFT-patch-1
Enable Jenkins to parse trx file
|
2017-03-02 14:52:27 -08:00 |
|
Piotr Puszkiewicz
|
236dccc987
|
Enable Jenkins to parse trx file
|
2017-03-02 11:26:19 -08:00 |
|
MichaelSimons
|
0917c8b06e
|
Switch Docker Hub repo being used to microsoft/dotnet-buildtools-prereqs
|
2017-03-02 10:36:55 -06:00 |
|