Skip to content

Commit

Permalink
Revert "Create SLCore assembly (#5123)"
Browse files Browse the repository at this point in the history
This reverts commit fe47292.
  • Loading branch information
ugras-ergun-sonarsource committed Dec 22, 2023
1 parent fe47292 commit b1a5093
Show file tree
Hide file tree
Showing 12 changed files with 6 additions and 194 deletions.
24 changes: 0 additions & 24 deletions SonarLint.VisualStudio.Integration.sln
Original file line number Diff line number Diff line change
Expand Up @@ -168,12 +168,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "VsAnalyzerConfig", "VsAnaly
src\vs-threading.MainThreadSwitchingMethods.txt = src\vs-threading.MainThreadSwitchingMethods.txt
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SLCore", "SLCore", "{236587E8-62A7-4E4E-815D-A50433859DC7}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SLCore", "src\SLCore\SLCore.csproj", "{4A5A716B-54E7-4F85-9340-2CB0827A6253}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SLCore.UnitTests", "src\SLCore.UnitTests\SLCore.UnitTests.csproj", "{72C861AC-2CAB-46C0-9A9E-06096F589395}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -502,22 +496,6 @@ Global
{4F5AE2A8-56DD-44EC-9872-B7884CC1C1DB}.Release|Any CPU.Build.0 = Release|Any CPU
{4F5AE2A8-56DD-44EC-9872-B7884CC1C1DB}.Release|x86.ActiveCfg = Release|Any CPU
{4F5AE2A8-56DD-44EC-9872-B7884CC1C1DB}.Release|x86.Build.0 = Release|Any CPU
{4A5A716B-54E7-4F85-9340-2CB0827A6253}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{4A5A716B-54E7-4F85-9340-2CB0827A6253}.Debug|Any CPU.Build.0 = Debug|Any CPU
{4A5A716B-54E7-4F85-9340-2CB0827A6253}.Debug|x86.ActiveCfg = Debug|Any CPU
{4A5A716B-54E7-4F85-9340-2CB0827A6253}.Debug|x86.Build.0 = Debug|Any CPU
{4A5A716B-54E7-4F85-9340-2CB0827A6253}.Release|Any CPU.ActiveCfg = Release|Any CPU
{4A5A716B-54E7-4F85-9340-2CB0827A6253}.Release|Any CPU.Build.0 = Release|Any CPU
{4A5A716B-54E7-4F85-9340-2CB0827A6253}.Release|x86.ActiveCfg = Release|Any CPU
{4A5A716B-54E7-4F85-9340-2CB0827A6253}.Release|x86.Build.0 = Release|Any CPU
{72C861AC-2CAB-46C0-9A9E-06096F589395}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{72C861AC-2CAB-46C0-9A9E-06096F589395}.Debug|Any CPU.Build.0 = Debug|Any CPU
{72C861AC-2CAB-46C0-9A9E-06096F589395}.Debug|x86.ActiveCfg = Debug|Any CPU
{72C861AC-2CAB-46C0-9A9E-06096F589395}.Debug|x86.Build.0 = Debug|Any CPU
{72C861AC-2CAB-46C0-9A9E-06096F589395}.Release|Any CPU.ActiveCfg = Release|Any CPU
{72C861AC-2CAB-46C0-9A9E-06096F589395}.Release|Any CPU.Build.0 = Release|Any CPU
{72C861AC-2CAB-46C0-9A9E-06096F589395}.Release|x86.ActiveCfg = Release|Any CPU
{72C861AC-2CAB-46C0-9A9E-06096F589395}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down Expand Up @@ -568,8 +546,6 @@ Global
{EE7F939B-7127-433C-80CD-5DB278361229} = {32F0945C-72D0-4116-95D5-F9EE2177D51B}
{4F5AE2A8-56DD-44EC-9872-B7884CC1C1DB} = {32F0945C-72D0-4116-95D5-F9EE2177D51B}
{682C440B-E506-4811-9569-9734D8DF4620} = {A4C88C9A-7C47-47FE-8AB6-8D7588D05EF1}
{4A5A716B-54E7-4F85-9340-2CB0827A6253} = {236587E8-62A7-4E4E-815D-A50433859DC7}
{72C861AC-2CAB-46C0-9A9E-06096F589395} = {236587E8-62A7-4E4E-815D-A50433859DC7}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {DABC27C8-E761-4826-AD2D-056F677EF3C0}
Expand Down
4 changes: 0 additions & 4 deletions src/CFamily.UnitTests/packages.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -1554,7 +1554,6 @@
"SonarLint.VisualStudio.ProgressVS": "[1.0.0, )",
"SonarLint.VisualStudio.Roslyn.Suppressions": "[1.0.0, )",
"SonarLint.VisualStudio.Rules": "[1.0.0, )",
"SonarLint.VisualStudio.SLCore": "[1.0.0, )",
"SonarLint.VisualStudio.TypeScript": "[1.0.0, )",
"SonarQube.Client": "[1.0.0, )",
"System.IO.Abstractions": "[9.0.4, )",
Expand Down Expand Up @@ -1714,9 +1713,6 @@
"SonarLint.VisualStudio.Core": "[1.0.0, )"
}
},
"SonarLint.VisualStudio.SLCore": {
"type": "Project"
},
"SonarLint.VisualStudio.TypeScript": {
"type": "Project",
"dependencies": {
Expand Down
4 changes: 0 additions & 4 deletions src/Integration.Vsix.UnitTests/packages.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -1565,7 +1565,6 @@
"SonarLint.VisualStudio.ProgressVS": "[1.0.0, )",
"SonarLint.VisualStudio.Roslyn.Suppressions": "[1.0.0, )",
"SonarLint.VisualStudio.Rules": "[1.0.0, )",
"SonarLint.VisualStudio.SLCore": "[1.0.0, )",
"SonarLint.VisualStudio.TypeScript": "[1.0.0, )",
"SonarQube.Client": "[1.0.0, )",
"System.IO.Abstractions": "[9.0.4, )",
Expand Down Expand Up @@ -1725,9 +1724,6 @@
"SonarLint.VisualStudio.Core": "[1.0.0, )"
}
},
"SonarLint.VisualStudio.SLCore": {
"type": "Project"
},
"SonarLint.VisualStudio.TypeScript": {
"type": "Project",
"dependencies": {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
################################
# Assembly references report
# Report date/time: 2023-12-22T12:01:41.1379104Z
# Report date/time: 2023-12-19T13:38:36.4345675Z
################################
#
# Generated by Devtility CheckAsmRefs v0.11.0.223
Expand All @@ -19,12 +19,12 @@
#
################################

# Base directory: C:\Code\sonarlint-visualstudio\src\Integration.Vsix\bin\Release\VS2022\net472
# Base directory: D:\a\1\s\src\Integration.Vsix\bin\Release\VS2022\net472
Include patterns:
- 'Sonar*'
Exclude patterns:
- 'SonarLint.Secrets.DotNet*'
# Number of matches: 22
# Number of matches: 21

---
Assembly: 'SonarAnalyzer.CFG, Version=9.15.0.0, Culture=neutral, PublicKeyToken=c5b62af9de6d7244'
Expand Down Expand Up @@ -439,14 +439,6 @@ Referenced assemblies:
- 'System.Core, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089'
# Number of references: 7

---
Assembly: 'SonarLint.VisualStudio.SLCore, Version=7.6.0.0, Culture=neutral, PublicKeyToken=c5b62af9de6d7244'
Relative path: 'SonarLint.VisualStudio.SLCore.dll'

Referenced assemblies:
- 'mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089'
# Number of references: 1

---
Assembly: 'SonarLint.VisualStudio.TypeScript, Version=7.6.0.0, Culture=neutral, PublicKeyToken=c5b62af9de6d7244'
Relative path: 'SonarLint.VisualStudio.TypeScript.dll'
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
################################
# Assembly references report
# Report date/time: 2023-12-22T12:01:41.1379104Z
# Report date/time: 2023-12-19T13:38:36.4345675Z
################################
#
# Generated by Devtility CheckAsmRefs v0.11.0.223
Expand All @@ -19,12 +19,12 @@
#
################################

# Base directory: C:\Code\sonarlint-visualstudio\src\Integration.Vsix\bin\Release\VS2022\net472
# Base directory: D:\a\1\s\src\Integration.Vsix\bin\Release\VS2022\net472
Include patterns:
- 'Sonar*'
Exclude patterns:
- 'SonarLint.Secrets.DotNet*'
# Number of matches: 22
# Number of matches: 21

---
Assembly: 'SonarAnalyzer.CFG, Version=9.15.0.0, Culture=neutral, PublicKeyToken=c5b62af9de6d7244'
Expand Down Expand Up @@ -439,14 +439,6 @@ Referenced assemblies:
- 'System.Core, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089'
# Number of references: 7

---
Assembly: 'SonarLint.VisualStudio.SLCore, Version=7.6.0.0, Culture=neutral, PublicKeyToken=null'
Relative path: 'SonarLint.VisualStudio.SLCore.dll'

Referenced assemblies:
- 'mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089'
# Number of references: 1

---
Assembly: 'SonarLint.VisualStudio.TypeScript, Version=7.6.0.0, Culture=neutral, PublicKeyToken=null'
Relative path: 'SonarLint.VisualStudio.TypeScript.dll'
Expand Down
6 changes: 0 additions & 6 deletions src/Integration.Vsix/Integration.Vsix.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -247,12 +247,6 @@
<IncludeOutputGroupsInVSIX>BuiltProjectOutputGroup%3bBuiltProjectOutputGroupDependencies%3bGetCopyToOutputDirectoryItems%3bSatelliteDllsProjectOutputGroup%3b</IncludeOutputGroupsInVSIX>
<IncludeOutputGroupsInVSIXLocalOnly>DebugSymbolsProjectOutputGroup%3b</IncludeOutputGroupsInVSIXLocalOnly>
</ProjectReference>
<ProjectReference Include="..\SLCore\SLCore.csproj">
<Project>{61B97D2B-8C79-41CD-AD7F-1F2E4AB6EED1}</Project>
<Name>SLCore</Name>
<IncludeOutputGroupsInVSIX>BuiltProjectOutputGroup%3bBuiltProjectOutputGroupDependencies%3bGetCopyToOutputDirectoryItems%3bSatelliteDllsProjectOutputGroup%3b</IncludeOutputGroupsInVSIX>
<IncludeOutputGroupsInVSIXLocalOnly>DebugSymbolsProjectOutputGroup%3b</IncludeOutputGroupsInVSIXLocalOnly>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<EmbeddedResource Update="Analysis\AnalysisStrings.resx">
Expand Down
3 changes: 0 additions & 3 deletions src/Integration.Vsix/packages.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -1665,9 +1665,6 @@
"SonarLint.VisualStudio.Core": "[1.0.0, )"
}
},
"SonarLint.VisualStudio.SLCore": {
"type": "Project"
},
"SonarLint.VisualStudio.TypeScript": {
"type": "Project",
"dependencies": {
Expand Down
15 changes: 0 additions & 15 deletions src/SLCore.UnitTests/SLCore.UnitTests.csproj

This file was deleted.

23 changes: 0 additions & 23 deletions src/SLCore.UnitTests/Usings.cs

This file was deleted.

76 changes: 0 additions & 76 deletions src/SLCore.UnitTests/packages.lock.json

This file was deleted.

11 changes: 0 additions & 11 deletions src/SLCore/SLCore.csproj

This file was deleted.

6 changes: 0 additions & 6 deletions src/SLCore/packages.lock.json

This file was deleted.

0 comments on commit b1a5093

Please sign in to comment.