PR feedback

ivanbasov · Feb 26, 2019 · f4e7a55 · f4e7a55
1 parent 81f3bc3
commit f4e7a55
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 9 deletions.
diff --git a/Roslyn.sln b/Roslyn.sln
@@ -1,6 +1,6 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27102.0
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.28620.130
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RoslynDeployment", "src\Deployment\RoslynDeployment.csproj", "{600AF682-E097-407B-AD85-EE3CED37E680}"
 EndProject

diff --git a/src/NuGet/Microsoft.Net.Compilers.Toolset/Microsoft.Net.Compilers.Toolset.Package.csproj b/src/NuGet/Microsoft.Net.Compilers.Toolset/Microsoft.Net.Compilers.Toolset.Package.csproj
@@ -9,10 +9,10 @@
     <IncludeBuildOutput>false</IncludeBuildOutput>
     <DevelopmentDependency>true</DevelopmentDependency>
     <PackageDescription>
-      .NET Compilers package.
+      .NET Compilers Toolset Package.
       Referencing this package will cause the project to be built using the specific version of the C# and Visual Basic compilers contained in the package, as opposed to any system installed version.
 
-      This package can be used to compile code targeting any platform, but can only be run using the desktop .NET 4.7.2+ Full Framework.
+      This package requires MSBuild 15.0 and either .NET Destkop 4.7.2 or .NET Core 2.1
       $(RoslynPackageDescriptionDetails)
     </PackageDescription>
     <TargetsForTfmSpecificContentInPackage>$(TargetsForTfmSpecificContentInPackage);_GetFilesToPackage</TargetsForTfmSpecificContentInPackage>
@@ -47,7 +47,6 @@
       <_File Include="@(CoreClrCompilerBinRuntimesArtifact)" TargetDir="tasks/netcoreapp2.1/bincore/runtimes"/>
 
       <_File Include="$(MSBuildProjectDirectory)\build\**\*.*" Condition="'$(TargetFramework)' == 'net472'" TargetDir="build" />
-      <_File Include="$(MSBuildProjectDirectory)\buildMultiTargeting\**\*.*" Condition="'$(TargetFramework)' == 'net472'" TargetDir="buildMultiTargeting" />
 
       <TfmSpecificPackageFile Include="@(_File)" PackagePath="%(_File.TargetDir)/%(_File.RecursiveDir)%(_File.FileName)%(_File.Extension)" />
     </ItemGroup>

diff --git a/...Microsoft.Net.Compilers.Toolset/buildMultiTargeting/Microsoft.Net.Compilers.Toolset.props b/...Microsoft.Net.Compilers.Toolset/buildMultiTargeting/Microsoft.Net.Compilers.Toolset.props
diff --git a/src/Tools/BuildBoss/CompilerNuGetCheckerUtil.cs b/src/Tools/BuildBoss/CompilerNuGetCheckerUtil.cs
@@ -403,6 +403,7 @@ private static bool IsTrackedAsset(string filePath)
             }
 
             return
+                filePath.EndsWith(".exe") ||
                 filePath.EndsWith(".targets") ||
                 filePath.EndsWith(".props");
         }
-Original file line number
+Diff line change
@@ Expand Up / @@ -403,6 +403,7 @@ private static bool IsTrackedAsset(string filePath) @@
                 }
                 return
+                    filePath.EndsWith(".exe") ||
                     filePath.EndsWith(".targets") ||
                     filePath.EndsWith(".props");
             }
@@ Expand Down @@