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

Remove cross project compile include on DotnetFiles.cs

Browse source
This commit is contained in:
Krzysztof Wicher 2016-12-29 14:34:24 -08:00
parent 961905a301
commit 941575d188
4 changed files with 3 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/dotnet/DotnetFiles.cs → src/Microsoft.DotNet.Cli.Utils/DotnetFiles.cs
View file

@ -9,7 +9,7 @@ using Microsoft.DotNet.PlatformAbstractions;
namespace Microsoft.DotNet.Cli namespace Microsoft.DotNet.Cli
{ {
internal static class DotnetFiles public static class DotnetFiles
{ {
private static string SdkRootFolder => Path.Combine(typeof(DotnetFiles).GetTypeInfo().Assembly.Location, ".."); private static string SdkRootFolder => Path.Combine(typeof(DotnetFiles).GetTypeInfo().Assembly.Location, "..");
@ -21,7 +21,7 @@ namespace Microsoft.DotNet.Cli
/// </summary> /// </summary>
public static string VersionFile => Path.GetFullPath(Path.Combine(SdkRootFolder, ".version")); public static string VersionFile => Path.GetFullPath(Path.Combine(SdkRootFolder, ".version"));
internal static DotnetVersionFile VersionFileObject public static DotnetVersionFile VersionFileObject
{ {
get { return s_versionFileObject.Value; } get { return s_versionFileObject.Value; }
} }

2
src/Microsoft.DotNet.Cli.Utils/DotnetVersionFile.cs
View file

@ -6,7 +6,7 @@ using System.IO;
namespace Microsoft.DotNet.Cli.Utils namespace Microsoft.DotNet.Cli.Utils
{ {
internal class DotnetVersionFile public class DotnetVersionFile
{ {
public bool Exists { get; set; } public bool Exists { get; set; }

1
test/Microsoft.DotNet.Cli.Utils.Tests/Microsoft.DotNet.Cli.Utils.Tests.csproj
View file

@ -13,7 +13,6 @@
<ItemGroup> <ItemGroup>
<Compile Include="**\*.cs" Exclude="bin\**;obj\**;**\*.xproj;packages\**" /> <Compile Include="**\*.cs" Exclude="bin\**;obj\**;**\*.xproj;packages\**" />
<Compile Include="..\..\src\dotnet\DotnetFiles.cs" />
<EmbeddedResource Include="**\*.resx" /> <EmbeddedResource Include="**\*.resx" />
<EmbeddedResource Include="compiler\resources\**\*" /> <EmbeddedResource Include="compiler\resources\**\*" />
<Content Include="..\..\artifacts\*\stage2\sdk\*\.version"> <Content Include="..\..\artifacts\*\stage2\sdk\*\.version">

1
test/Microsoft.DotNet.Tools.Tests.Utilities/Microsoft.DotNet.Tools.Tests.Utilities.csproj
View file

@ -13,7 +13,6 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Compile Include="**\*.cs" Exclude="bin\**;obj\**;**\*.xproj;packages\**" /> <Compile Include="**\*.cs" Exclude="bin\**;obj\**;**\*.xproj;packages\**" />
<Compile Include="..\..\src\dotnet\DotnetFiles.cs" Exclude="bin\**;obj\**;**\*.xproj;packages\**" />
<EmbeddedResource Include="**\*.resx" /> <EmbeddedResource Include="**\*.resx" />
<EmbeddedResource Include="compiler\resources\**\*" /> <EmbeddedResource Include="compiler\resources\**\*" />
</ItemGroup> </ItemGroup>