mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge pull request #5906 from piotrpMSFT/piotrpMSFT/infra/CodeCleanup

Browse source 
Code Cleanup
This commit is contained in:
Piotr Puszkiewicz 2017-03-02 23:26:28 -08:00 • committed by GitHub
commit cc80822c16
582 changed files with 1996 additions and 1996 deletions
Download patch file Download diff file Expand all files Collapse all files

20
TestAssets/DesktopTestProjects/AppWithProjTool2Fx/App.csproj
View file

@ -5,27 +5,19 @@
<PackageTargetFallback Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">$(PackageTargetFallback);portable-net45+win8;dnxcore50</PackageTargetFallback> <PackageTargetFallback Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">$(PackageTargetFallback);portable-net45+win8;dnxcore50</PackageTargetFallback>
<RuntimeIdentifiers>win7-x64;win7-x86;osx.10.10-x64;osx.10.11-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;centos.7-x64;rhel.7.2-x64;debian.8-x64</RuntimeIdentifiers> <RuntimeIdentifiers>win7-x64;win7-x86;osx.10.10-x64;osx.10.11-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;centos.7-x64;rhel.7.2-x64;debian.8-x64</RuntimeIdentifiers>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="dotnet-desktop-and-portable"> <PackageReference Include="dotnet-desktop-and-portable" Version="1.0.0-*" />
<Version>1.0.0-*</Version>
</PackageReference>
</ItemGroup> </ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' "> <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">
<PackageReference Include="Microsoft.NETCore.App"> <PackageReference Include="Microsoft.NETCore.App" Version="1.0.3" />
<Version>1.0.3</Version>
</PackageReference>
</ItemGroup> </ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'net451' "> <ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
<Reference Include="System" /> <Reference Include="System" />
<Reference Include="Microsoft.CSharp" /> <Reference Include="Microsoft.CSharp" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<DotNetCliToolReference Include="dotnet-dependency-tool-invoker"> <DotNetCliToolReference Include="dotnet-dependency-tool-invoker" Version="1.0.0-*" />
<Version>1.0.0-*</Version>
</DotNetCliToolReference>
</ItemGroup> </ItemGroup>
<PropertyGroup Condition=" '$(Configuration)' == 'Release' "> </Project>
<DefineConstants>$(DefineConstants);RELEASE</DefineConstants>
</PropertyGroup>
</Project>

5
TestAssets/DesktopTestProjects/AppWithProjTool2Fx/Program.cs
View file

@ -1,4 +1,7 @@
using System; // Copyright (c) .NET Foundation and contributors. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
using System;
namespace ConsoleApplication namespace ConsoleApplication
{ {

5
TestAssets/DesktopTestProjects/AutoAddDesktopReferencesDuringMigrate/Program.cs
View file

@ -1,4 +1,7 @@
using System.Collections.Generic; // Copyright (c) .NET Foundation and contributors. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
using System.Collections.Generic;
using System.Diagnostics; using System.Diagnostics;
using System.Linq; using System.Linq;
using Microsoft.CSharp.RuntimeBinder; using Microsoft.CSharp.RuntimeBinder;

23
TestAssets/DesktopTestProjects/BindingRedirectSample/AppWithRedirectsAndConfig/AppWithRedirectsAndConfig.csproj
View file

@ -11,18 +11,10 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Newtonsoft.Json"> <PackageReference Include="Newtonsoft.Json" Version="8.0.3" />
<Version>8.0.3</Version> <PackageReference Include="Microsoft.AspNet.Mvc" Version="3.0.50813.1" />
</PackageReference> <PackageReference Include="Unity.Mvc" Version="3.0.1304" />
<PackageReference Include="Microsoft.AspNet.Mvc"> <PackageReference Include="dotnet-desktop-binding-redirects" Version="1.0.0-*" />
<Version>3.0.50813.1</Version>
</PackageReference>
<PackageReference Include="Unity.Mvc">
<Version>3.0.1304</Version>
</PackageReference>
<PackageReference Include="dotnet-desktop-binding-redirects">
<Version>1.0.0-*</Version>
</PackageReference>
</ItemGroup> </ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'net46' "> <ItemGroup Condition=" '$(TargetFramework)' == 'net46' ">
@ -31,12 +23,7 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<DotNetCliToolReference Include="dotnet-dependency-tool-invoker"> <DotNetCliToolReference Include="dotnet-dependency-tool-invoker" Version="1.0.0-*" />
<Version>1.0.0-*</Version>
</DotNetCliToolReference>
</ItemGroup> </ItemGroup>
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
<DefineConstants>$(DefineConstants);RELEASE</DefineConstants>
</PropertyGroup>
</Project> </Project>

23
TestAssets/DesktopTestProjects/BindingRedirectSample/AppWithRedirectsNoConfig/AppWithRedirectsNoConfig.csproj
View file

@ -11,18 +11,10 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Newtonsoft.Json"> <PackageReference Include="Newtonsoft.Json" Version="8.0.3" />
<Version>8.0.3</Version> <PackageReference Include="Microsoft.AspNet.Mvc" Version="3.0.50813.1" />
</PackageReference> <PackageReference Include="Unity.Mvc" Version="3.0.1304" />
<PackageReference Include="Microsoft.AspNet.Mvc"> <PackageReference Include="dotnet-desktop-binding-redirects" Version="1.0.0-*" />
<Version>3.0.50813.1</Version>
</PackageReference>
<PackageReference Include="Unity.Mvc">
<Version>3.0.1304</Version>
</PackageReference>
<PackageReference Include="dotnet-desktop-binding-redirects">
<Version>1.0.0-*</Version>
</PackageReference>
</ItemGroup> </ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'net46' "> <ItemGroup Condition=" '$(TargetFramework)' == 'net46' ">
@ -31,12 +23,7 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<DotNetCliToolReference Include="dotnet-dependency-tool-invoker"> <DotNetCliToolReference Include="dotnet-dependency-tool-invoker" Version="1.0.0-*" />
<Version>1.0.0-*</Version>
</DotNetCliToolReference>
</ItemGroup> </ItemGroup>
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
<DefineConstants>$(DefineConstants);RELEASE</DefineConstants>
</PropertyGroup>
</Project> </Project>

5
TestAssets/DesktopTestProjects/BindingRedirectSample/src/Program.cs
View file

@ -1,4 +1,7 @@
using System; // Copyright (c) .NET Foundation and contributors. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Diagnostics; using System.Diagnostics;
using System.Linq; using System.Linq;

3
TestAssets/DesktopTestProjects/DesktopAppWithNativeDep/Program.cs
View file

@ -1,3 +1,6 @@
// Copyright (c) .NET Foundation and contributors. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
using System; using System;
namespace DesktopAppWithNativeDep namespace DesktopAppWithNativeDep

3
TestAssets/DesktopTestProjects/DesktopAppWithRuntimes/Program.cs
View file

@ -1,3 +1,6 @@
// Copyright (c) .NET Foundation and contributors. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
using System; using System;
namespace DesktopAppWithRuntimes namespace DesktopAppWithRuntimes

18
TestAssets/DesktopTestProjects/LibWithProjTool2Fx/Lib.csproj
View file

@ -6,25 +6,17 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="dotnet-desktop-and-portable"> <PackageReference Include="dotnet-desktop-and-portable" Version="1.0.0-*" />
<Version>1.0.0-*</Version>
</PackageReference>
</ItemGroup> </ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.6' "> <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.6' ">
<PackageReference Include="NETStandard.Library"> <PackageReference Include="NETStandard.Library" Version="1.6.0" />
<Version>1.6.0</Version>
</PackageReference>
</ItemGroup> </ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'net451' "> <ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
<Reference Include="System" /> <Reference Include="System" />
<Reference Include="Microsoft.CSharp" /> <Reference Include="Microsoft.CSharp" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<DotNetCliToolReference Include="dotnet-dependency-tool-invoker"> <DotNetCliToolReference Include="dotnet-dependency-tool-invoker" Version="1.0.0-*" />
<Version>1.0.0-*</Version>
</DotNetCliToolReference>
</ItemGroup> </ItemGroup>
<PropertyGroup Condition=" '$(Configuration)' == 'Release' "> </Project>
<DefineConstants>$(DefineConstants);RELEASE</DefineConstants>
</PropertyGroup>
</Project>

5
TestAssets/DesktopTestProjects/LibWithProjTool2Fx/Program.cs
View file

@ -1,4 +1,7 @@
using System; // Copyright (c) .NET Foundation and contributors. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
using System;
namespace ConsoleApplication namespace ConsoleApplication
{ {

4
TestAssets/NonRestoredTestProjects/AppThrowingException/App/AppThrowingException.csproj
View file

@ -14,9 +14,7 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.NETCore.App"> <PackageReference Include="Microsoft.NETCore.App" Version="1.0.3" />
<Version>1.0.3</Version>
</PackageReference>
</ItemGroup> </ItemGroup>
</Project> </Project>

5
TestAssets/NonRestoredTestProjects/AppThrowingException/App/Program.cs
View file

@ -1,3 +1,6 @@
// Copyright (c) .NET Foundation and contributors. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
using System; using System;
namespace AppThrowing namespace AppThrowing
@ -9,4 +12,4 @@ namespace AppThrowing
throw new MyException(); throw new MyException();
} }
} }
} }

8
TestAssets/NonRestoredTestProjects/AppThrowingException/AppDependingOnOtherAsTool/AppDependingOnOtherAsTool.csproj
View file

@ -6,15 +6,11 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.NETCore.App"> <PackageReference Include="Microsoft.NETCore.App" Version="1.0.3" />
<Version>1.0.3</Version>
</PackageReference>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<DotNetCliToolReference Include="dotnet-throwingtool"> <DotNetCliToolReference Include="dotnet-throwingtool" Version="1.0.0" />
<Version>1.0.0</Version>
</DotNetCliToolReference>
</ItemGroup> </ItemGroup>
</Project> </Project>

3
TestAssets/NonRestoredTestProjects/AppThrowingException/AppDependingOnOtherAsTool/Program.cs
View file

@ -1,3 +1,6 @@
// Copyright (c) .NET Foundation and contributors. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
using System; using System;
class Program class Program

4
TestAssets/NonRestoredTestProjects/AppWithNonExistingToolDependency/AppWithNonExistingToolDependency.csproj
View file

@ -10,9 +10,7 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<DotNetCliToolReference Include="dotnet-nonexistingtool"> <DotNetCliToolReference Include="dotnet-nonexistingtool" Version="1.0.0" />
<Version>1.0.0</Version>
</DotNetCliToolReference>
</ItemGroup> </ItemGroup>
</Project> </Project>

5
TestAssets/NonRestoredTestProjects/AppWithNonExistingToolDependency/Program.cs
View file

@ -1,4 +1,7 @@
using System; // Copyright (c) .NET Foundation and contributors. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
using System;
namespace ConsoleApplication namespace ConsoleApplication
{ {

3
TestAssets/NonRestoredTestProjects/AppWithProjectDependencyAsTarget/TestApp/Program.cs
View file

@ -1,3 +1,6 @@
// Copyright (c) .NET Foundation and contributors. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
using System; using System;
namespace ConsoleApplication namespace ConsoleApplication

1
TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/Broken/Broken.csproj
View file

@ -3,6 +3,7 @@
<OutputType>Library</OutputType> <OutputType>Library</OutputType>
<TargetFrameworks>net451;netcoreapp1.0</TargetFrameworks> <TargetFrameworks>net451;netcoreapp1.0</TargetFrameworks>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Compile Include="**\*.cs" /> <Compile Include="**\*.cs" />
<EmbeddedResource Include="**\*.resx" /> <EmbeddedResource Include="**\*.resx" />

7
TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/EmptyItemGroup/EmptyItemGroup.cs
View file

@ -1,3 +1,6 @@
public class EmptyItemGroup // Copyright (c) .NET Foundation and contributors. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
public class EmptyItemGroup
{ {
} }

5
TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/EmptyItemGroup/EmptyItemGroup.csproj
View file

@ -5,10 +5,9 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' "> <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">
<PackageReference Include="Microsoft.NETCore.App"> <PackageReference Include="Microsoft.NETCore.App" Version="1.0.3" />
<Version>1.0.3</Version>
</PackageReference>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<!-- Existing but empty item group - do not remove --> <!-- Existing but empty item group - do not remove -->
</ItemGroup> </ItemGroup>

2
TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/Lib/Lib.cs
View file

@ -1,4 +1,4 @@
// Dummy reference - it can be used as an existing reference in any of the projects // Dummy reference - it can be used as an existing reference in any of the projects
public class Lib public class Lib
{ {
} }

4
TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/Lib/Lib.csproj
View file

@ -5,8 +5,6 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' "> <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">
<PackageReference Include="Microsoft.NETCore.App"> <PackageReference Include="Microsoft.NETCore.App" Version="1.0.3" />
<Version>1.0.3</Version>
</PackageReference>
</ItemGroup> </ItemGroup>
</Project> </Project>

5
TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/MoreThanOne/SomeSourceFile.cs
View file

@ -1,3 +1,6 @@
public class SomeClass // Copyright (c) .NET Foundation and contributors. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
public class SomeClass
{ {
} }

5
TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/MoreThanOne/a.csproj
View file

@ -3,9 +3,8 @@
<OutputType>Library</OutputType> <OutputType>Library</OutputType>
<TargetFrameworks>netcoreapp1.0</TargetFrameworks> <TargetFrameworks>netcoreapp1.0</TargetFrameworks>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.NETCore.App"> <PackageReference Include="Microsoft.NETCore.App" Version="1.0.3" />
<Version>1.0.3</Version>
</PackageReference>
</ItemGroup> </ItemGroup>
</Project> </Project>

5
TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/MoreThanOne/b.csproj
View file

@ -3,9 +3,8 @@
<OutputType>Library</OutputType> <OutputType>Library</OutputType>
<TargetFrameworks>netcoreapp1.0</TargetFrameworks> <TargetFrameworks>netcoreapp1.0</TargetFrameworks>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.NETCore.App"> <PackageReference Include="Microsoft.NETCore.App" Version="1.0.3" />
<Version>1.0.3</Version>
</PackageReference>
</ItemGroup> </ItemGroup>
</Project> </Project>

5
TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/Net452AndNetCoreApp10Lib/Net452AndNetCoreApp10Lib.cs
View file

@ -1,3 +1,6 @@
public class Net452AndNetCoreApp10Lib // Copyright (c) .NET Foundation and contributors. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
public class Net452AndNetCoreApp10Lib
{ {
} }

4
TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/Net452AndNetCoreApp10Lib/Net452AndNetCoreApp10Lib.csproj
View file

@ -4,8 +4,6 @@
<TargetFrameworks>net452;netcoreapp1.0</TargetFrameworks> <TargetFrameworks>net452;netcoreapp1.0</TargetFrameworks>
</PropertyGroup> </PropertyGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' "> <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">
<PackageReference Include="Microsoft.NETCore.App"> <PackageReference Include="Microsoft.NETCore.App" Version="1.0.3" />
<Version>1.0.3</Version>
</PackageReference>
</ItemGroup> </ItemGroup>
</Project> </Project>

5
TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/Net45Lib/Net45Lib.cs
View file

@ -1,3 +1,6 @@
public class Net45Lib // Copyright (c) .NET Foundation and contributors. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
public class Net45Lib
{ {
} }

4
TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/Net45Lib/Net45Lib.csproj
View file

@ -4,8 +4,6 @@
<TargetFrameworks>net45</TargetFrameworks> <TargetFrameworks>net45</TargetFrameworks>
</PropertyGroup> </PropertyGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' "> <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">
<PackageReference Include="Microsoft.NETCore.App"> <PackageReference Include="Microsoft.NETCore.App" Version="1.0.3" />
<Version>1.0.3</Version>
</PackageReference>
</ItemGroup> </ItemGroup>
</Project> </Project>

2
TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/ValidRef/ValidRef.cs
View file

@ -2,4 +2,4 @@
// it should be used as a reference passed to the dotnet add p2p // it should be used as a reference passed to the dotnet add p2p
public class ValidRef public class ValidRef
{ {
} }

4
TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/ValidRef/ValidRef.csproj
View file

@ -4,8 +4,6 @@
<TargetFrameworks>net451;netcoreapp1.0;netstandard1.4</TargetFrameworks> <TargetFrameworks>net451;netcoreapp1.0;netstandard1.4</TargetFrameworks>
</PropertyGroup> </PropertyGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' "> <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">
<PackageReference Include="Microsoft.NETCore.App"> <PackageReference Include="Microsoft.NETCore.App" Version="1.0.3" />
<Version>1.0.3</Version>
</PackageReference>
</ItemGroup> </ItemGroup>
</Project> </Project>

7
TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/WithDoubledRef/WithDoubledRef.cs
View file

@ -1,3 +1,6 @@
public class WithDoubledRef // Copyright (c) .NET Foundation and contributors. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
public class WithDoubledRef
{ {
} }

5
TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/WithDoubledRef/WithDoubledRef.csproj
View file

@ -4,10 +4,9 @@
<TargetFrameworks>net451;netcoreapp1.0</TargetFrameworks> <TargetFrameworks>net451;netcoreapp1.0</TargetFrameworks>
</PropertyGroup> </PropertyGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' "> <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">
<PackageReference Include="Microsoft.NETCore.App"> <PackageReference Include="Microsoft.NETCore.App" Version="1.0.3" />
<Version>1.0.3</Version>
</PackageReference>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\Lib\Lib.csproj" /> <ProjectReference Include="..\Lib\Lib.csproj" />
<ProjectReference Include="..\Lib\Lib.csproj" /> <ProjectReference Include="..\Lib\Lib.csproj" />

7
TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/WithExistingRefCondOnItem/WithExistingRefCondOnItem.cs
View file

@ -1,3 +1,6 @@
public class WithExistingRefCondOnItem // Copyright (c) .NET Foundation and contributors. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
public class WithExistingRefCondOnItem
{ {
} }

5
TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/WithExistingRefCondOnItem/WithExistingRefCondOnItem.csproj
View file

@ -4,10 +4,9 @@
<TargetFrameworks>net451;netcoreapp1.0</TargetFrameworks> <TargetFrameworks>net451;netcoreapp1.0</TargetFrameworks>
</PropertyGroup> </PropertyGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' "> <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">
<PackageReference Include="Microsoft.NETCore.App"> <PackageReference Include="Microsoft.NETCore.App" Version="1.0.3" />
<Version>1.0.3</Version>
</PackageReference>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Condition=" '$(TargetFramework)' == 'net451' " Include="..\Lib\Lib.csproj" /> <ProjectReference Condition=" '$(TargetFramework)' == 'net451' " Include="..\Lib\Lib.csproj" />
</ItemGroup> </ItemGroup>

7
TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/WithExistingRefCondWhitespaces/WithExistingRefCondWhitespaces.cs
View file

@ -1,3 +1,6 @@
public class WithExistingRefCondWhitespaces // Copyright (c) .NET Foundation and contributors. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
public class WithExistingRefCondWhitespaces
{ {
} }

4
TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/WithExistingRefCondWhitespaces/WithExistingRefCondWhitespaces.csproj
View file

@ -4,9 +4,7 @@
<TargetFrameworks>net451;netcoreapp1.0</TargetFrameworks> <TargetFrameworks>net451;netcoreapp1.0</TargetFrameworks>
</PropertyGroup> </PropertyGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' "> <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">
<PackageReference Include="Microsoft.NETCore.App"> <PackageReference Include="Microsoft.NETCore.App" Version="1.0.3" />
<Version>1.0.3</Version>
</PackageReference>
</ItemGroup> </ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'net451'" > <ItemGroup Condition=" '$(TargetFramework)' == 'net451'" >
<ProjectReference Include="..\Lib\Lib.csproj" /> <ProjectReference Include="..\Lib\Lib.csproj" />

7
TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/WithRefCondNonUniform/WithRefCondNonUniform.cs
View file

@ -1,3 +1,6 @@
public class WithRefCondNonUniform // Copyright (c) .NET Foundation and contributors. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
public class WithRefCondNonUniform
{ {
} }

4
TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/WithRefCondNonUniform/WithRefCondNonUniform.csproj
View file

@ -4,9 +4,7 @@
<TargetFrameworks>net451;netcoreapp1.0</TargetFrameworks> <TargetFrameworks>net451;netcoreapp1.0</TargetFrameworks>
</PropertyGroup> </PropertyGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' "> <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">
<PackageReference Include="Microsoft.NETCore.App"> <PackageReference Include="Microsoft.NETCore.App" Version="1.0.3" />
<Version>1.0.3</Version>
</PackageReference>
</ItemGroup> </ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'net451' "> <ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
<SomeItemCausingThisGroupToNotBeUniform Include="foo" /> <SomeItemCausingThisGroupToNotBeUniform Include="foo" />

7
TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/WithRefNoCondNonUniform/WithRefNoCondNonUniform.cs
View file

@ -1,3 +1,6 @@
public class WithRefNoCondNonUniform // Copyright (c) .NET Foundation and contributors. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
public class WithRefNoCondNonUniform
{ {
} }

5
TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/WithRefNoCondNonUniform/WithRefNoCondNonUniform.csproj
View file

@ -4,10 +4,9 @@
<TargetFrameworks>net451;netcoreapp1.0</TargetFrameworks> <TargetFrameworks>net451;netcoreapp1.0</TargetFrameworks>
</PropertyGroup> </PropertyGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' "> <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">
<PackageReference Include="Microsoft.NETCore.App"> <PackageReference Include="Microsoft.NETCore.App" Version="1.0.3" />
<Version>1.0.3</Version>
</PackageReference>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<SomeItemCausingThisGroupToNotBeUniform Include="foo" /> <SomeItemCausingThisGroupToNotBeUniform Include="foo" />
<ProjectReference Include="..\Lib\Lib.csproj" /> <ProjectReference Include="..\Lib\Lib.csproj" />

5
TestAssets/NonRestoredTestProjects/PJAppWithSlnAndXprojRefThatRefsCsprojWhereSlnDoesNotRefCsproj/TestApp/Program.cs
View file

@ -1,4 +1,7 @@
using System; // Copyright (c) .NET Foundation and contributors. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Threading.Tasks; using System.Threading.Tasks;

7
TestAssets/NonRestoredTestProjects/PJAppWithSlnAndXprojRefThatRefsCsprojWhereSlnDoesNotRefCsproj/TestApp/src/subdir/subdir.csproj
View file

@ -9,13 +9,8 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="NETStandard.Library"> <PackageReference Include="NETStandard.Library" Version="1.6.0" />
<Version>1.6.0</Version>
</PackageReference>
</ItemGroup> </ItemGroup>
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
<DefineConstants>$(DefineConstants);RELEASE</DefineConstants>
</PropertyGroup>
</Project> </Project>

5
TestAssets/NonRestoredTestProjects/PJAppWithSlnAndXprojRefThatRefsCsprojWhereSlnDoesNotRefCsproj/TestLibrary/Helper.cs
View file

@ -1,4 +1,7 @@
using System; // Copyright (c) .NET Foundation and contributors. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Threading.Tasks; using System.Threading.Tasks;

3
TestAssets/NonRestoredTestProjects/PJAppWithSlnAndXprojRefs/TestApp/TestAssets/TestAsset/Program.cs
View file

@ -1,3 +1,6 @@
// Copyright (c) .NET Foundation and contributors. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
using System; using System;
namespace App.Tests namespace App.Tests

5
TestAssets/NonRestoredTestProjects/PJDeprecatedCompilation/Program.cs
View file

@ -1,4 +1,7 @@
using System; // Copyright (c) .NET Foundation and contributors. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
using System;
namespace ConsoleApplication namespace ConsoleApplication
{ {

3
TestAssets/NonRestoredTestProjects/PJDeprecatedCompile/Helper1.cs
View file

@ -1,3 +1,6 @@
// Copyright (c) .NET Foundation and contributors. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
using System; using System;
namespace ConsoleApplication namespace ConsoleApplication

3
TestAssets/NonRestoredTestProjects/PJDeprecatedCompile/Helper2.cs
View file

@ -1,3 +1,6 @@
// Copyright (c) .NET Foundation and contributors. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
using System; using System;
namespace ConsoleApplication namespace ConsoleApplication

3
TestAssets/NonRestoredTestProjects/PJDeprecatedCompile/project/IncludeThis.cs
View file

@ -1,3 +1,6 @@
// Copyright (c) .NET Foundation and contributors. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
using System; using System;
namespace ConsoleApplication namespace ConsoleApplication

5
TestAssets/NonRestoredTestProjects/PJDeprecatedCompile/project/Program.cs
View file

@ -1,4 +1,7 @@
using System; // Copyright (c) .NET Foundation and contributors. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
using System;
namespace ConsoleApplication namespace ConsoleApplication
{ {

3
TestAssets/NonRestoredTestProjects/PJDeprecatedCompileBuiltIn/HelperBuiltIn1.cs
View file

@ -1,3 +1,6 @@
// Copyright (c) .NET Foundation and contributors. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
using System; using System;
namespace ConsoleApplication namespace ConsoleApplication

3
TestAssets/NonRestoredTestProjects/PJDeprecatedCompileBuiltIn/HelperBuiltIn2.cs
View file

@ -1,3 +1,6 @@
// Copyright (c) .NET Foundation and contributors. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
using System; using System;
namespace ConsoleApplication namespace ConsoleApplication

3
TestAssets/NonRestoredTestProjects/PJDeprecatedCompileBuiltIn/project/IncludeThis.cs
View file

@ -1,3 +1,6 @@
// Copyright (c) .NET Foundation and contributors. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
using System; using System;
namespace ConsoleApplication namespace ConsoleApplication

5
TestAssets/NonRestoredTestProjects/PJDeprecatedCompileBuiltIn/project/Program.cs
View file

@ -1,4 +1,7 @@
using System; // Copyright (c) .NET Foundation and contributors. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
using System;
namespace ConsoleApplication namespace ConsoleApplication
{ {

3
TestAssets/NonRestoredTestProjects/PJDeprecatedCompileExclude/ExcludeThis1.cs
View file

@ -1 +1,4 @@
// Copyright (c) .NET Foundation and contributors. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
This does not compile but is used to test compile exclusion. This does not compile but is used to test compile exclusion.

3
TestAssets/NonRestoredTestProjects/PJDeprecatedCompileExclude/ExcludeThis2.cs
View file

@ -1 +1,4 @@
// Copyright (c) .NET Foundation and contributors. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
This does not compile but is used to test compile exclusion. This does not compile but is used to test compile exclusion.

5
TestAssets/NonRestoredTestProjects/PJDeprecatedCompileExclude/Program.cs
View file

@ -1,4 +1,7 @@
using System; // Copyright (c) .NET Foundation and contributors. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
using System;
namespace ConsoleApplication namespace ConsoleApplication
{ {

5
TestAssets/NonRestoredTestProjects/PJDeprecatedContent/project/Program.cs
View file

@ -1,4 +1,7 @@
using System; // Copyright (c) .NET Foundation and contributors. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
using System;
namespace ConsoleApplication namespace ConsoleApplication
{ {

3
TestAssets/NonRestoredTestProjects/PJDeprecatedNamedResource/Program.cs
View file

@ -1,3 +1,6 @@
// Copyright (c) .NET Foundation and contributors. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
using System; using System;
using System.Linq; using System.Linq;
using System.Reflection; using System.Reflection;

5
TestAssets/NonRestoredTestProjects/PJDeprecatedPack/Program.cs
View file

@ -1,4 +1,7 @@
using System; // Copyright (c) .NET Foundation and contributors. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
using System;
namespace ConsoleApplication namespace ConsoleApplication
{ {

5
TestAssets/NonRestoredTestProjects/PJDeprecatedResource/project/Program.cs
View file

@ -1,4 +1,7 @@
using System; // Copyright (c) .NET Foundation and contributors. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
using System;
using System.Linq; using System.Linq;
using System.Reflection; using System.Reflection;

5
TestAssets/NonRestoredTestProjects/PJDeprecatedResourceBuiltIn/project/Program.cs
View file

@ -1,4 +1,7 @@
using System; // Copyright (c) .NET Foundation and contributors. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
using System;
using System.Linq; using System.Linq;
using System.Reflection; using System.Reflection;

5
TestAssets/NonRestoredTestProjects/PJDeprecatedResourceExclude/Program.cs
View file

@ -1,4 +1,7 @@
using System; // Copyright (c) .NET Foundation and contributors. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
using System;
using System.Linq; using System.Linq;
using System.Reflection; using System.Reflection;

5
TestAssets/NonRestoredTestProjects/PJHalfMigrated/ProjectB/Program.cs
View file

@ -1,4 +1,7 @@
using System; // Copyright (c) .NET Foundation and contributors. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
using System;
namespace ConsoleApplication namespace ConsoleApplication
{ {

5
TestAssets/NonRestoredTestProjects/PJHalfMigrated/src/ProjectA/Program.cs
View file

@ -1,4 +1,7 @@
using System; // Copyright (c) .NET Foundation and contributors. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
using System;
namespace ConsoleApplication namespace ConsoleApplication
{ {

3
TestAssets/NonRestoredTestProjects/TestProjectWithSelfReferencingDependency/Program.cs
View file

@ -1,3 +1,6 @@
// Copyright (c) .NET Foundation and contributors. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
using System; using System;
namespace ConsoleApplication namespace ConsoleApplication

5
TestAssets/NonRestoredTestProjects/TestProjectWithUnresolvedDependency/Program.cs
View file

@ -1,4 +1,7 @@
using System; // Copyright (c) .NET Foundation and contributors. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
using System;
namespace ConsoleApplication namespace ConsoleApplication
{ {

5
TestAssets/NonRestoredTestProjects/TestProjectWithUnresolvedPlatformDependency/Program.cs
View file

@ -1,4 +1,7 @@
using System; // Copyright (c) .NET Foundation and contributors. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
using System;
namespace ConsoleApplication namespace ConsoleApplication
{ {

8
TestAssets/NonRestoredTestProjects/TestProjectWithUnresolvedPlatformDependency/TestProjectWithUnresolvedPlatformDependency.csproj
View file

@ -4,12 +4,8 @@
<OutputType>Exe</OutputType> <OutputType>Exe</OutputType>
<PackageTargetFallback Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">$(PackageTargetFallback);dnxcore50</PackageTargetFallback> <PackageTargetFallback Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">$(PackageTargetFallback);dnxcore50</PackageTargetFallback>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="ThisIsNotARealDependencyAndIfSomeoneGoesAndAddsAProjectWithThisNameIWillFindThemAndPunishThem"> <PackageReference Include="ThisIsNotARealDependencyAndIfSomeoneGoesAndAddsAProjectWithThisNameIWillFindThemAndPunishThem" Version="1.0.0" />
<Version>1.0.0</Version>
</PackageReference>
</ItemGroup> </ItemGroup>
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
<DefineConstants>$(DefineConstants);RELEASE</DefineConstants>
</PropertyGroup>
</Project> </Project>

4
TestAssets/NonRestoredTestProjects/ToolWithRandomPackageName/AppWithDepOnTool/AppWithDepOnTool.csproj
View file

@ -8,9 +8,7 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.NETCore.App" Version="1.0.3" /> <PackageReference Include="Microsoft.NETCore.App" Version="1.0.3" />
<DotNetCliToolReference Include="$(GeneratedPackageId)"> <DotNetCliToolReference Include="$(GeneratedPackageId)" Version="1.0.0" />
<Version>1.0.0</Version>
</DotNetCliToolReference>
</ItemGroup> </ItemGroup>
</Project> </Project>

3
TestAssets/NonRestoredTestProjects/ToolWithRandomPackageName/AppWithDepOnTool/Program.cs
View file

@ -1,3 +1,6 @@
// Copyright (c) .NET Foundation and contributors. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
using System; using System;
class Program class Program

3
TestAssets/NonRestoredTestProjects/ToolWithRandomPackageName/ToolWithRandomPackageName/Program.cs
View file

@ -1,3 +1,6 @@
// Copyright (c) .NET Foundation and contributors. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
using System; using System;
class Program class Program

3
TestAssets/TestPackages/PackageWithFakeNativeDep/Lib.cs
View file

@ -1,3 +1,6 @@
// Copyright (c) .NET Foundation and contributors. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
namespace PackageWithFakeNativeDep namespace PackageWithFakeNativeDep
{ {
public static class Lib public static class Lib

7
TestAssets/TestPackages/PackageWithFakeNativeDep/PackageWithFakeNativeDep.csproj
View file

@ -13,9 +13,7 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="NETStandard.Library"> <PackageReference Include="NETStandard.Library" Version="1.6.0" />
<Version>1.6.0</Version>
</PackageReference>
</ItemGroup> </ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'net45' "> <ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">
@ -23,7 +21,4 @@
<Reference Include="Microsoft.CSharp" /> <Reference Include="Microsoft.CSharp" />
</ItemGroup> </ItemGroup>
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
<DefineConstants>$(DefineConstants);RELEASE</DefineConstants>
</PropertyGroup>
</Project> </Project>

3
TestAssets/TestPackages/ToolWithOutputName/Program.cs
View file

@ -1,3 +1,6 @@
// Copyright (c) .NET Foundation and contributors. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
using System; using System;
namespace ConsoleApplication namespace ConsoleApplication

7
TestAssets/TestPackages/ToolWithOutputName/ToolWithOutputName.csproj
View file

@ -13,12 +13,7 @@
</ItemGroup> </ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' "> <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">
<PackageReference Include="Microsoft.NETCore.App"> <PackageReference Include="Microsoft.NETCore.App" Version="1.0.4" />
<Version>1.0.4</Version>
</PackageReference>
</ItemGroup> </ItemGroup>
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
<DefineConstants>$(DefineConstants);RELEASE</DefineConstants>
</PropertyGroup>
</Project> </Project>

5
TestAssets/TestPackages/dotnet-dependency-context-test/Program.cs
View file

@ -1,4 +1,7 @@
using System; // Copyright (c) .NET Foundation and contributors. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
using System;
using System.Linq; using System.Linq;
using Microsoft.Extensions.DependencyModel; using Microsoft.Extensions.DependencyModel;

11
TestAssets/TestPackages/dotnet-dependency-context-test/dotnet-dependency-context-test.csproj
View file

@ -14,15 +14,8 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.NETCore.App"> <PackageReference Include="Microsoft.NETCore.App" Version="1.0.4" />
<Version>1.0.4</Version> <PackageReference Include="Microsoft.Extensions.DependencyModel" Version="1.0.1-beta-000933" />
</PackageReference>
<PackageReference Include="Microsoft.Extensions.DependencyModel">
<Version>1.0.1-beta-000933</Version>
</PackageReference>
</ItemGroup> </ItemGroup>
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
<DefineConstants>$(DefineConstants);RELEASE</DefineConstants>
</PropertyGroup>
</Project> </Project>

11
TestAssets/TestPackages/dotnet-dependency-tool-invoker/Program.cs
View file

@ -1,4 +1,7 @@
using System; // Copyright (c) .NET Foundation and contributors. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
using System;
using System.IO; using System.IO;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
@ -14,13 +17,13 @@ namespace Microsoft.DotNet.Tools.DependencyInvoker
DebugHelper.HandleDebugSwitch(ref args); DebugHelper.HandleDebugSwitch(ref args);
var dotnetParams = new DotnetBaseParams("dotnet-dependency-tool-invoker", "DotNet Dependency Tool Invoker", "Invokes tools declared as NuGet dependencies of a project"); var dotnetParams = new DotnetBaseParams("dotnet-dependency-tool-invoker", "DotNet Dependency Tool Invoker", "Invokes tools declared as NuGet dependencies of a project");
dotnetParams.Parse(args); dotnetParams.Parse(args);
if (string.IsNullOrEmpty(dotnetParams.Command)) if (string.IsNullOrEmpty(dotnetParams.Command))
{ {
Console.WriteLine("A command name must be provided"); Console.WriteLine("A command name must be provided");
return 1; return 1;
} }

17
TestAssets/TestPackages/dotnet-dependency-tool-invoker/dotnet-dependency-tool-invoker.csproj
View file

@ -17,24 +17,17 @@
<ItemGroup> <ItemGroup>
<Compile Include="..\..\..\src\dotnet\CommandLine\*.cs;..\..\..\src\dotnet\CommonLocalizableStrings.cs;" Exclude="bin\**;obj\**;**\*.xproj;packages\**" /> <Compile Include="..\..\..\src\dotnet\CommandLine\*.cs;..\..\..\src\dotnet\CommonLocalizableStrings.cs;" Exclude="bin\**;obj\**;**\*.xproj;packages\**" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<BuiltProjectOutputGroupOutput Include="$(ProjectRuntimeConfigFilePath)"> <BuiltProjectOutputGroupOutput Include="$(ProjectRuntimeConfigFilePath)">
<FinalOutputPath>$(ProjectRuntimeConfigFilePath)</FinalOutputPath> <FinalOutputPath>$(ProjectRuntimeConfigFilePath)</FinalOutputPath>
</BuiltProjectOutputGroupOutput> </BuiltProjectOutputGroupOutput>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.NETCore.App"> <PackageReference Include="Microsoft.NETCore.App" Version="1.0.4" />
<Version>1.0.4</Version> <PackageReference Include="NuGet.Frameworks" Version="$(CLI_NuGet_Version)" />
</PackageReference> <PackageReference Include="Microsoft.DotNet.Cli.Utils" Version="$(SdkNugetVersion)" />
<PackageReference Include="NuGet.Frameworks">
<Version>$(CLI_NuGet_Version)</Version>
</PackageReference>
<PackageReference Include="Microsoft.DotNet.Cli.Utils">
<Version>$(SdkNugetVersion)</Version>
</PackageReference>
</ItemGroup> </ItemGroup>
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
<DefineConstants>$(DefineConstants);RELEASE</DefineConstants>
</PropertyGroup>
</Project> </Project>

5
TestAssets/TestPackages/dotnet-desktop-and-portable/Program.cs
View file

@ -1,4 +1,7 @@
using System; // Copyright (c) .NET Foundation and contributors. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
using System;
using System.Reflection; using System.Reflection;
namespace ConsoleApplication namespace ConsoleApplication

4
TestAssets/TestPackages/dotnet-desktop-and-portable/dotnet-desktop-and-portable.csproj
View file

@ -14,9 +14,7 @@
</ItemGroup> </ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' "> <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">
<PackageReference Include="Microsoft.NETCore.App"> <PackageReference Include="Microsoft.NETCore.App" Version="1.0.4" />
<Version>1.0.4</Version>
</PackageReference>
</ItemGroup> </ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'net451' "> <ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">

5
TestAssets/TestPackages/dotnet-desktop-binding-redirects/Program.cs
View file

@ -1,4 +1,7 @@
using System; // Copyright (c) .NET Foundation and contributors. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Diagnostics; using System.Diagnostics;
using System.Linq; using System.Linq;

7
TestAssets/TestPackages/dotnet-desktop-binding-redirects/dotnet-desktop-binding-redirects.csproj
View file

@ -9,9 +9,7 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Newtonsoft.Json"> <PackageReference Include="Newtonsoft.Json" Version="5.0.0" />
<Version>5.0.0</Version>
</PackageReference>
</ItemGroup> </ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'net451' "> <ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
@ -20,7 +18,4 @@
<Reference Include="Microsoft.CSharp" /> <Reference Include="Microsoft.CSharp" />
</ItemGroup> </ItemGroup>
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
<DefineConstants>$(DefineConstants);RELEASE</DefineConstants>
</PropertyGroup>
</Project> </Project>

5
TestAssets/TestPackages/dotnet-hello/v1/dotnet-hello/Program.cs
View file

@ -1,4 +1,7 @@
using System; // Copyright (c) .NET Foundation and contributors. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
using System;
namespace ConsoleApplication namespace ConsoleApplication
{ {

5
TestAssets/TestPackages/dotnet-hello/v2/dotnet-hello/Program.cs
View file

@ -1,4 +1,7 @@
using System; // Copyright (c) .NET Foundation and contributors. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
using System;
namespace ConsoleApplication namespace ConsoleApplication
{ {

5
TestAssets/TestPackages/dotnet-portable/Program.cs
View file

@ -1,4 +1,7 @@
using System; // Copyright (c) .NET Foundation and contributors. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
using System;
namespace ConsoleApplication namespace ConsoleApplication
{ {

7
TestAssets/TestPackages/dotnet-portable/dotnet-portable.csproj
View file

@ -15,12 +15,7 @@
</ItemGroup> </ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' "> <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">
<PackageReference Include="Microsoft.NETCore.App"> <PackageReference Include="Microsoft.NETCore.App" Version="1.0.4" />
<Version>1.0.4</Version>
</PackageReference>
</ItemGroup> </ItemGroup>
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
<DefineConstants>$(DefineConstants);RELEASE</DefineConstants>
</PropertyGroup>
</Project> </Project>

5
TestAssets/TestPackages/dotnet-prefercliruntime/Program.cs
View file

@ -1,4 +1,7 @@
using System; // Copyright (c) .NET Foundation and contributors. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
using System;
namespace ConsoleApplication namespace ConsoleApplication
{ {

6
TestAssets/TestPackages/dotnet-prefercliruntime/dotnet-prefercliruntime.csproj
View file

@ -11,7 +11,7 @@
<BuiltProjectOutputGroupOutput Include="$(ProjectRuntimeConfigFilePath)"> <BuiltProjectOutputGroupOutput Include="$(ProjectRuntimeConfigFilePath)">
<FinalOutputPath>$(ProjectRuntimeConfigFilePath)</FinalOutputPath> <FinalOutputPath>$(ProjectRuntimeConfigFilePath)</FinalOutputPath>
</BuiltProjectOutputGroupOutput> </BuiltProjectOutputGroupOutput>
<Content Include="prefercliruntime"> <Content Include="prefercliruntime">
<Pack>true</Pack> <Pack>true</Pack>
<PackagePath>\prefercliruntime</PackagePath> <PackagePath>\prefercliruntime</PackagePath>
@ -19,9 +19,7 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.NETCore.App"> <PackageReference Include="Microsoft.NETCore.App" Version="1.0.0" />
<Version>1.0.0</Version>
</PackageReference>
</ItemGroup> </ItemGroup>
</Project> </Project>

5
TestAssets/TestProjects/AppWith2Tfm0Rid/Program.cs
View file

@ -1,4 +1,7 @@
using System; // Copyright (c) .NET Foundation and contributors. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
using System;
using System.Xml; using System.Xml;
namespace ConsoleApplication namespace ConsoleApplication

5
TestAssets/TestProjects/AppWith4netTfm0Rid/Program.cs
View file

@ -1,4 +1,7 @@
using System; // Copyright (c) .NET Foundation and contributors. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
using System;
using System.Xml; using System.Xml;
namespace ConsoleApplication namespace ConsoleApplication

5
TestAssets/TestProjects/AppWithAppDependency/TestApp1/Program.cs
View file

@ -1,4 +1,7 @@
using System; // Copyright (c) .NET Foundation and contributors. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
using System;
namespace ConsoleApplication namespace ConsoleApplication
{ {

5
TestAssets/TestProjects/AppWithAppDependency/TestApp2/Program.cs
View file

@ -1,4 +1,7 @@
using System; // Copyright (c) .NET Foundation and contributors. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
using System;
namespace ConsoleApplication namespace ConsoleApplication
{ {

5
TestAssets/TestProjects/AppWithAssemblyInfo/Program.cs
View file

@ -1,4 +1,7 @@
using System; // Copyright (c) .NET Foundation and contributors. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Threading.Tasks; using System.Threading.Tasks;

5
TestAssets/TestProjects/AppWithAssemblyInfo/Properties/AssemblyInfo.cs
View file

@ -1,4 +1,7 @@
using System.Reflection; // Copyright (c) .NET Foundation and contributors. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
using System.Reflection;
using System.Runtime.CompilerServices; using System.Runtime.CompilerServices;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;

12
TestAssets/TestProjects/AppWithDepOnToolWithOutputName/AppWithDepOnToolWithOutputName.csproj
View file

@ -5,16 +5,10 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.NETCore.App"> <PackageReference Include="Microsoft.NETCore.App" Version="1.0.3" />
<Version>1.0.3</Version>
</PackageReference>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<DotNetCliToolReference Include="ToolWithOutputName"> <DotNetCliToolReference Include="ToolWithOutputName" Version="1.0.0" />
<Version>1.0.0</Version>
</DotNetCliToolReference>
</ItemGroup> </ItemGroup>
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
<DefineConstants>$(DefineConstants);RELEASE</DefineConstants>
</PropertyGroup>
</Project> </Project>

3
TestAssets/TestProjects/AppWithDepOnToolWithOutputName/Program.cs
View file

@ -1,3 +1,6 @@
// Copyright (c) .NET Foundation and contributors. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
using System; using System;
namespace ConsoleApplication namespace ConsoleApplication

9
TestAssets/TestProjects/AppWithDirectAndToolDep/AppWithDirectAndToolDep.csproj
View file

@ -5,13 +5,10 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="dotnet-hello"> <PackageReference Include="dotnet-hello" Version="1.0.0" />
<Version>1.0.0</Version>
</PackageReference>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<DotNetCliToolReference Include="dotnet-portable"> <DotNetCliToolReference Include="dotnet-portable" Version="1.0.0" />
<Version>1.0.0</Version>
</DotNetCliToolReference>
</ItemGroup> </ItemGroup>
</Project> </Project>

5
TestAssets/TestProjects/AppWithDirectAndToolDep/Program.cs
View file

@ -1,4 +1,7 @@
using System; // Copyright (c) .NET Foundation and contributors. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
using System;
namespace ConsoleApplication namespace ConsoleApplication
{ {

Some files were not shown because too many files have changed in this diff Show more