This repository has been archived on 2025-09-07. You can view files and clone it, but you cannot make any changes to it's state, such as pushing and creating new issues, pull requests or comments.

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
..
App.csproj	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
Program.cs	Add missing copyright headers to all cs files	2017-03-02 21:04:03 -08:00