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

Remove CscToolPath

Browse source
This commit is contained in:
Ashley Hauck 2017-08-23 08:34:33 -07:00
parent 04c8a68539
commit 97b027b232
5 changed files with 0 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
TestAssets/TestProjects/MSBuildIntegration/build.proj
View file

@ -29,9 +29,6 @@
<Error Condition=" '$(MSBuildExtensionsPath)' == '' " <Error Condition=" '$(MSBuildExtensionsPath)' == '' "
Text="Expected MSBuildExtensionsPath to be set, but it is not." /> Text="Expected MSBuildExtensionsPath to be set, but it is not." />
<Error Condition=" '$(CscToolExe)' == '' "
Text="Expected CscToolExe to be set, but it is not." />
<Error Condition=" '$(MSBuildSDKsPath)' == '' " <Error Condition=" '$(MSBuildSDKsPath)' == '' "
Text="Expected MSBuildSDKsPath to be set, but it is not." /> Text="Expected MSBuildSDKsPath to be set, but it is not." />

2
build_projects/Microsoft.DotNet.Cli.Build.SelfTest/InvokeWithStage2.proj
View file

@ -7,8 +7,6 @@
<PropertyGroup> <PropertyGroup>
<MSBuildExtensionsPathInToolPath>false</MSBuildExtensionsPathInToolPath> <MSBuildExtensionsPathInToolPath>false</MSBuildExtensionsPathInToolPath>
<MSBuildExtensionsPathInToolPath Condition="$(MSBuildExtensionsPath.StartsWith('$(NormalizedToolPath)'))">true</MSBuildExtensionsPathInToolPath> <MSBuildExtensionsPathInToolPath Condition="$(MSBuildExtensionsPath.StartsWith('$(NormalizedToolPath)'))">true</MSBuildExtensionsPathInToolPath>
<CscToolExeInToolPath>false</CscToolExeInToolPath>
<CscToolExeInToolPath Condition="$(CscToolExe.StartsWith('$(NormalizedToolPath)'))">true</CscToolExeInToolPath>
<MSBuildSDKsPathInToolPath>false</MSBuildSDKsPathInToolPath> <MSBuildSDKsPathInToolPath>false</MSBuildSDKsPathInToolPath>
<MSBuildSDKsPathInToolPath Condition="$(MSBuildSDKsPath.StartsWith('$(NormalizedToolPath)'))">true</MSBuildSDKsPathInToolPath> <MSBuildSDKsPathInToolPath Condition="$(MSBuildSDKsPath.StartsWith('$(NormalizedToolPath)'))">true</MSBuildSDKsPathInToolPath>
</PropertyGroup> </PropertyGroup>

15
src/Microsoft.DotNet.Cli.Utils/MSBuildForwardingAppWithoutLogging.cs
View file

@ -23,10 +23,6 @@ namespace Microsoft.DotNet.Cli.Utils
new Dictionary<string, string> new Dictionary<string, string>
{ {
{ "MSBuildExtensionsPath", AppContext.BaseDirectory }, { "MSBuildExtensionsPath", AppContext.BaseDirectory },
{ "CscToolPath", GetRunToolPath() },
{ "VbcToolPath", GetRunToolPath() },
{ "CscToolExe", GetRunToolExe("Csc") },
{ "VbcToolExe", GetRunToolExe("Vbc") },
{ "MSBuildSDKsPath", GetMSBuildSDKsPath() }, { "MSBuildSDKsPath", GetMSBuildSDKsPath() },
{ "DOTNET_HOST_PATH", GetDotnetPath() }, { "DOTNET_HOST_PATH", GetDotnetPath() },
}; };
@ -81,17 +77,6 @@ namespace Microsoft.DotNet.Cli.Utils
SdksDirectoryName); SdksDirectoryName);
} }
private static string GetRunToolPath()
{
return Path.Combine(AppContext.BaseDirectory, "Roslyn", "bincore");
}
private static string GetRunToolExe(string compilerName)
{
var scriptExtension = RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? ".cmd" : "";
return $"Run{compilerName}{scriptExtension}";
}
private static string GetDotnetPath() private static string GetDotnetPath()
{ {
return new Muxer().MuxerPath; return new Muxer().MuxerPath;

2
src/redist/redist.csproj
View file

@ -291,8 +291,6 @@
<Exec Command="find $(SdkOutputDirectory) -type d -exec chmod 755 {} \;" /> <Exec Command="find $(SdkOutputDirectory) -type d -exec chmod 755 {} \;" />
<Exec Command="find $(SdkOutputDirectory) -type f -exec chmod 644 {} \;" /> <Exec Command="find $(SdkOutputDirectory) -type f -exec chmod 644 {} \;" />
<Chmod Mode="755" Glob="$(SdkOutputDirectory)/Roslyn/bincore/RunCsc" />
<Chmod Mode="755" Glob="$(SdkOutputDirectory)/Roslyn/bincore/RunVbc" />
<Chmod Mode="755" Glob="$(SdkOutputDirectory)/FSharp/RunFsc.sh" /> <Chmod Mode="755" Glob="$(SdkOutputDirectory)/FSharp/RunFsc.sh" />
</Target> </Target>

23
test/dotnet-msbuild.Tests/GivenMsbuildForwardingApp.cs
View file

@ -31,8 +31,6 @@ namespace Microsoft.DotNet.Cli.MSBuild.Tests
[Theory] [Theory]
[InlineData("MSBuildExtensionsPath")] [InlineData("MSBuildExtensionsPath")]
[InlineData("CscToolExe")]
[InlineData("VbcToolExe")]
[InlineData("MSBuildSDKsPath")] [InlineData("MSBuildSDKsPath")]
[InlineData("DOTNET_CLI_TELEMETRY_SESSIONID")] [InlineData("DOTNET_CLI_TELEMETRY_SESSIONID")]
public void ItSetsEnvironmentalVariables(string envVarName) public void ItSetsEnvironmentalVariables(string envVarName)
@ -66,27 +64,6 @@ namespace Microsoft.DotNet.Cli.MSBuild.Tests
.Exist(); .Exist();
} }
[Fact]
public void ItSetsCscToolExePathToValidPath()
{
var msbuildPath = "<msbuildpath>";
var envVar = "CscToolExe";
new FileInfo(new MSBuildForwardingApp(new string[0], msbuildPath)
.GetProcessStartInfo()
.Environment[envVar])
.Should().NotBeNull("constructor will throw on invalid path");
}
[Fact]
public void ItSetsVbcToolExePathToValidPath()
{
var msbuildPath = "<msbuildpath>";
var envVar = "VbcToolExe";
new FileInfo(new MSBuildForwardingApp(new string[0], msbuildPath)
.GetProcessStartInfo()
.Environment[envVar])
.Should().NotBeNull("constructor will throw on invalid path");
}
[Fact] [Fact]
public void ItSetsOrIgnoresTelemetrySessionId() public void ItSetsOrIgnoresTelemetrySessionId()