Add prefix to shared assemblies (fix #833)

dotnet · Aug 15, 2021 · a01ac47 · a01ac47
1 parent dab46df
commit a01ac47
Show file tree

Hide file tree

Showing 5 changed files with 51 additions and 12 deletions.
diff --git a/src/Common/Common.csproj b/src/Common/Common.csproj
@@ -6,7 +6,7 @@
 
   <PropertyGroup>
     <Version>3.2.1.1</Version>
-    <AssemblyName>Roslynator.Common</AssemblyName>
+    <AssemblyName>$(RoslynatorDllPrefix)Roslynator.Common</AssemblyName>
     <RootNamespace>Roslynator</RootNamespace>
   </PropertyGroup>
 

diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -13,4 +13,16 @@
     <RoslynatorDllPrefix>_</RoslynatorDllPrefix>
   </PropertyGroup>
 
+  <PropertyGroup Condition="'$(RoslynatorAnalyzersNuGet)' == true">
+    <RoslynatorDllPrefix>Roslynator_Analyzers_</RoslynatorDllPrefix>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(RoslynatorCodeAnalysisAnalyzersNuGet)' == true">
+    <RoslynatorDllPrefix>Roslynator_CodeAnalysis_Analyzers_</RoslynatorDllPrefix>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(RoslynatorFormattingAnalyzersNuGet)' == true">
+    <RoslynatorDllPrefix>Roslynator_Formatting_Analyzers_</RoslynatorDllPrefix>
+  </PropertyGroup>
+
 </Project>
diff --git a/src/Workspaces.Common/Workspaces.Common.csproj b/src/Workspaces.Common/Workspaces.Common.csproj
@@ -6,7 +6,7 @@
 
   <PropertyGroup>
     <Version>3.2.1.1</Version>
-    <AssemblyName>Roslynator.Workspaces.Common</AssemblyName>
+    <AssemblyName>$(RoslynatorDllPrefix)Roslynator.Workspaces.Common</AssemblyName>
     <RootNamespace>Roslynator</RootNamespace>
   </PropertyGroup>
 

diff --git a/tools/build.cmd b/tools/build.cmd
@@ -114,9 +114,34 @@ del /Q "..\src\Tests\Testing.Common\bin\Release\Roslynator.Testing.Common.*.nupk
 del /Q "..\src\Tests\Testing.CSharp\bin\Release\Roslynator.Testing.CSharp.*.nupkg"
 del /Q "..\src\Tests\Testing.CSharp.Xunit\bin\Release\Roslynator.Testing.CSharp.Xunit.*.nupkg"
 
+md "%_outDir%"
+del /Q "%_outDir%\*"
+
+orang replace "../src" -n "AssemblyInfo.cs" e -c "patterns/assembly_names_to_be_prefixed.txt" f -r "Roslynator_Analyzers_"
+orang delete "../src" -a d -n "bin,obj" l li e -i "packages,node_modules" l li e ne -t n --content-only -y su s
+dotnet restore --force "../src\Roslynator.sln"
+%_msbuildPath% "../src\Roslynator.sln" /t:Build /p:%_properties%,RoslynatorAnalyzersNuGet=true /v:normal /m
 dotnet pack -c Release --no-build -v normal "..\src\Analyzers.CodeFixes\Analyzers.CodeFixes.csproj"
+copy "..\src\Analyzers.CodeFixes\bin\Release\Roslynator.Analyzers.*.nupkg" "%_outDir%"
+
+orang replace "../src" -n "AssemblyInfo.cs" e -c "patterns/assembly_names_to_be_prefixed.txt" f -r ""
+orang replace "../src" -n "AssemblyInfo.cs" e -c "patterns/assembly_names_to_be_prefixed.txt" f -r "Roslynator_CodeAnalysis_Analyzers_"
+orang delete "../src" -a d -n "bin,obj" l li e -i "packages,node_modules" l li e ne -t n --content-only -y su s
+dotnet restore --force "../src\Roslynator.sln"
+%_msbuildPath% "../src\Roslynator.sln" /t:Build /p:%_properties%,RoslynatorCodeAnalysisAnalyzersNuGet=true /v:normal /m
 dotnet pack -c Release --no-build -v normal "..\src\CodeAnalysis.Analyzers.CodeFixes\CodeAnalysis.Analyzers.CodeFixes.csproj"
+copy "..\src\CodeAnalysis.Analyzers.CodeFixes\bin\Release\Roslynator.CodeAnalysis.Analyzers.*.nupkg" "%_outDir%"
+
+orang replace "../src" -n "AssemblyInfo.cs" e -c "patterns/assembly_names_to_be_prefixed.txt" f -r ""
+orang replace "../src" -n "AssemblyInfo.cs" e -c "patterns/assembly_names_to_be_prefixed.txt" f -r "Roslynator_Formatting_Analyzers_"
+orang delete "../src" -a d -n "bin,obj" l li e -i "packages,node_modules" l li e ne -t n --content-only -y su s
+dotnet restore --force "../src\Roslynator.sln"
+%_msbuildPath% "../src\Roslynator.sln" /t:Build /p:%_properties%,RoslynatorFormattingAnalyzersNuGet=true /v:normal /m
 dotnet pack -c Release --no-build -v normal "..\src\Formatting.Analyzers.CodeFixes\Formatting.Analyzers.CodeFixes.csproj"
+copy "..\src\Formatting.Analyzers.CodeFixes\bin\Release\Roslynator.Formatting.Analyzers.*.nupkg" "%_outDir%"
+
+orang replace "../src" -n "AssemblyInfo.cs" e -c "patterns/assembly_names_to_be_prefixed.txt" f -r ""
+
 dotnet pack -c Release --no-build -v normal "..\src\Core\Core.csproj"
 dotnet pack -c Release --no-build -v normal "..\src\Workspaces.Core\Workspaces.Core.csproj"
 dotnet pack -c Release --no-build -v normal "..\src\CSharp\CSharp.csproj"
@@ -127,16 +152,8 @@ dotnet pack -c Release --no-build -v normal "..\src\Tests\Testing.CSharp.Xunit\T
 
 del /Q "..\src\VisualStudio\bin\Release\Roslynator.VisualStudio.*.vsix"
 ren    "..\src\VisualStudio\bin\Release\Roslynator.VisualStudio.vsix" "Roslynator.VisualStudio.%_version%.vsix"
-
-md "%_outDir%"
-
-del /Q "%_outDir%\*"
-
 copy "..\src\VisualStudio\bin\Release\Roslynator.VisualStudio.%_version%.vsix" "%_outDir%"
 
-copy "..\src\Analyzers.CodeFixes\bin\Release\Roslynator.Analyzers.*.nupkg" "%_outDir%"
-copy "..\src\CodeAnalysis.Analyzers.CodeFixes\bin\Release\Roslynator.CodeAnalysis.Analyzers.*.nupkg" "%_outDir%"
-copy "..\src\Formatting.Analyzers.CodeFixes\bin\Release\Roslynator.Formatting.Analyzers.*.nupkg" "%_outDir%"
 copy "..\src\Core\bin\Release\Roslynator.Core.*.nupkg" "%_outDir%"
 copy "..\src\Workspaces.Core\bin\Release\Roslynator.Workspaces.Core.*.nupkg" "%_outDir%"
 copy "..\src\CSharp\bin\Release\Roslynator.CSharp.*.nupkg" "%_outDir%"

diff --git a/tools/patterns/assembly_names_to_be_prefixed.txt b/tools/patterns/assembly_names_to_be_prefixed.txt
@@ -2,17 +2,27 @@
 (?<=
   assembly:\ InternalsVisibleTo\("
 )
-_?
+(
+    _
+  |
+    Roslynator_Analyzers_
+  |
+    Roslynator_CodeAnalysis_Analyzers_
+  |
+    Roslynator_Formatting_Analyzers_
+)?
 (?=
   Roslynator\.
   (
     Core
+  |
+    Common
   |
     CSharp(\.Workspaces)?
   |
     VisualBasic(\.Workspaces)?
   |
-    Workspaces\.Core
+    Workspaces\.(Core|Common)
   |
     Documentation
   )