diff --git a/Compilers.sln b/Compilers.sln index 1b65e345bdcc9..2d80a270c1790 100644 --- a/Compilers.sln +++ b/Compilers.sln @@ -142,7 +142,7 @@ Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "CSharpAnalyzerDriver", "src EndProject Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "BasicAnalyzerDriver", "src\Compilers\VisualBasic\BasicAnalyzerDriver\BasicAnalyzerDriver.shproj", "{E8F0BAA5-7327-43D1-9A51-644E81AE55F1}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IlAsmDeploy", "src\Tools\ILAsm\IlAsmDeploy.csproj", "{46B3E63A-C462-4133-9F27-3B85DA5E7D37}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILAsm", "src\Tools\ILTools\ILTools.proj", "{46B3E63A-C462-4133-9F27-3B85DA5E7D37}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Packages", "Packages", "{274B96B7-F815-47E3-9CA4-4024A57A478F}" EndProject diff --git a/Roslyn.sln b/Roslyn.sln index 0a7c2d096afca..50d95fe0e20f3 100644 --- a/Roslyn.sln +++ b/Roslyn.sln @@ -356,7 +356,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.CodeAnalysis.Edit EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AnalyzerRunner", "src\Tools\AnalyzerRunner\AnalyzerRunner.csproj", "{60166C60-813C-46C4-911D-2411B4ABBC0F}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IlAsmDeploy", "src\Tools\ILAsm\IlAsmDeploy.csproj", "{DA8522ED-02BC-499C-AC71-1DF884F63987}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILTools", "src\Tools\ILTools\ILTools.proj", "{DA8522ED-02BC-499C-AC71-1DF884F63987}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.CodeAnalysis.Debugging.Package", "src\Dependencies\CodeAnalysis.Debugging\Microsoft.CodeAnalysis.Debugging.Package.csproj", "{FC2AE90B-2E4B-4045-9FDD-73D4F5ED6C89}" EndProject diff --git a/eng/Versions.props b/eng/Versions.props index 363cace313ce1..aecd8e90031f7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -71,6 +71,8 @@ $(RoslynDiagnosticsNugetPackageVersion) 3.0.0-preview4-27525-72 + 3.0.0-preview4-27525-72 + 3.0.0-preview4-27525-72 2.1.2 15.9.0-dev2 diff --git a/src/Test/Utilities/Portable/Metadata/IlasmUtilities.cs b/src/Test/Utilities/Portable/Metadata/IlasmUtilities.cs index bb077a12c9adc..6a65c53010d69 100644 --- a/src/Test/Utilities/Portable/Metadata/IlasmUtilities.cs +++ b/src/Test/Utilities/Portable/Metadata/IlasmUtilities.cs @@ -39,7 +39,7 @@ private static string GetIlasmPath() const string configuration = "Release"; #endif - while (directory != null && !File.Exists(path = Path.Combine(directory, "artifacts", "tools", "ILAsm", configuration, ilasmExeName))) + while (directory != null && !File.Exists(path = Path.Combine(directory, "artifacts", "tools", "ILTools", configuration, ilasmExeName))) { directory = Path.GetDirectoryName(directory); } diff --git a/src/Test/Utilities/Portable/Roslyn.Test.Utilities.csproj b/src/Test/Utilities/Portable/Roslyn.Test.Utilities.csproj index 930cc0e556c13..260517afbba4d 100644 --- a/src/Test/Utilities/Portable/Roslyn.Test.Utilities.csproj +++ b/src/Test/Utilities/Portable/Roslyn.Test.Utilities.csproj @@ -18,7 +18,7 @@ Note SkipGetTargetFrameworkProperties makes it possible to reference project with incompatible TFM. GlobalPropertiesToRemove makes sure TargetFramework isn't set as a global property for the target project. --> - + @@ -101,4 +101,4 @@ - \ No newline at end of file + diff --git a/src/Tools/BuildBoss/ProjectCheckerUtil.cs b/src/Tools/BuildBoss/ProjectCheckerUtil.cs index 362323efe1bbc..35638c674adb4 100644 --- a/src/Tools/BuildBoss/ProjectCheckerUtil.cs +++ b/src/Tools/BuildBoss/ProjectCheckerUtil.cs @@ -63,6 +63,10 @@ public bool Check(TextWriter textWriter) allGood &= CheckPackageReferences(textWriter); allGood &= CheckDeploymentSettings(textWriter); } + else if (ProjectType == ProjectFileType.Tool) + { + allGood &= CheckPackageReferences(textWriter); + } return allGood; } @@ -459,6 +463,7 @@ private bool CheckTargetFrameworks(TextWriter textWriter, RoslynProjectData data case "net472": case "netcoreapp1.1": case "netcoreapp2.1": + case "netcoreapp3.0": case "$(RoslynPortableTargetFrameworks)": continue; } diff --git a/src/Tools/BuildBoss/ProjectEntry.cs b/src/Tools/BuildBoss/ProjectEntry.cs index 1bf79543d81b4..69f89b442bd6c 100644 --- a/src/Tools/BuildBoss/ProjectEntry.cs +++ b/src/Tools/BuildBoss/ProjectEntry.cs @@ -53,6 +53,7 @@ internal static ProjectFileType GetProjectFileType(string path) case ".csproj": return ProjectFileType.CSharp; case ".vbproj": return ProjectFileType.Basic; case ".shproj": return ProjectFileType.Shared; + case ".proj": return ProjectFileType.Tool; default: return ProjectFileType.Unknown; } diff --git a/src/Tools/BuildBoss/ProjectType.cs b/src/Tools/BuildBoss/ProjectType.cs index 7a643d1981ce2..c11c014585867 100644 --- a/src/Tools/BuildBoss/ProjectType.cs +++ b/src/Tools/BuildBoss/ProjectType.cs @@ -11,6 +11,7 @@ internal enum ProjectFileType CSharp, Basic, Shared, + Tool, Unknown } } diff --git a/src/Tools/BuildBoss/SolutionCheckerUtil.cs b/src/Tools/BuildBoss/SolutionCheckerUtil.cs index 2052964315bcd..376c69678320b 100644 --- a/src/Tools/BuildBoss/SolutionCheckerUtil.cs +++ b/src/Tools/BuildBoss/SolutionCheckerUtil.cs @@ -115,7 +115,7 @@ Guid getExpectedGuid(ProjectData data) } var allGood = true; - foreach (var data in dataList) + foreach (var data in dataList.Where(x => x.ProjectEntry.ProjectType != ProjectFileType.Tool)) { var guid = getExpectedGuid(data.ProjectData); if (guid != data.ProjectEntry.TypeGuid) diff --git a/src/Tools/ILAsm/Program.cs b/src/Tools/ILAsm/Program.cs deleted file mode 100644 index f289d4dc1cee8..0000000000000 --- a/src/Tools/ILAsm/Program.cs +++ /dev/null @@ -1,9 +0,0 @@ -using System; - -internal static class Program -{ - internal static void Main() - { - throw new Exception("This should not be run"); - } -} diff --git a/src/Tools/ILAsm/IlAsmDeploy.csproj b/src/Tools/ILTools/ILTools.proj similarity index 50% rename from src/Tools/ILAsm/IlAsmDeploy.csproj rename to src/Tools/ILTools/ILTools.proj index deabfd741f61d..f26aee0d179e4 100644 --- a/src/Tools/ILAsm/IlAsmDeploy.csproj +++ b/src/Tools/ILTools/ILTools.proj @@ -1,18 +1,19 @@ - - - + - netcoreapp3.0 - Exe + netcoreapp2.1 - false - true + true + true + true + false + false + false - $(ArtifactsDir)tools\ILAsm\$(Configuration)\ + $(ArtifactsDir)tools\ILTools\$(Configuration)\ @@ -33,9 +34,9 @@ - - - + + + @@ -55,4 +56,17 @@ + + + + + $(MSBuildExtensionsPath)\Microsoft\VisualStudio\Managed\Microsoft.Managed.DesignTime.targets + + + + + + + +