Files extensions_asset_map.json and vs_assets_map.json moved to Config/ directory

Reavert · Reavert · commit 67f71f55ba60 · 2024-02-23T02:50:49.000+03:00
diff --git a/VisualStudioDiscordRPC.Dev16/VisualStudioDiscordRPC.Dev16.csproj b/VisualStudioDiscordRPC.Dev16/VisualStudioDiscordRPC.Dev16.csproj
@@ -60,15 +60,10 @@
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
       <IncludeInVSIX>true</IncludeInVSIX>
     </Content>
-    <Content Include="..\VisualStudioDiscordRPC.Shared\extensions_assets_map.json">
-      <Link>extensions_assets_map.json</Link>
-      <IncludeInVSIX>true</IncludeInVSIX>
+    <Content Include="..\VisualStudioDiscordRPC.Shared\Configs\*.*">
+      <Link>Configs\%(Filename).%(Extension)</Link>
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Include="..\VisualStudioDiscordRPC.Shared\vs_assets_map.json">
-      <Link>extensions_assets_map.json</Link>
       <IncludeInVSIX>true</IncludeInVSIX>
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
     <Content Include="..\VisualStudioDiscordRPC.Shared\Translations\*.*">
       <Link>Translations\%(Filename).%(Extension)</Link>
diff --git a/VisualStudioDiscordRPC.Dev17/VisualStudioDiscordRPC.Dev17.csproj b/VisualStudioDiscordRPC.Dev17/VisualStudioDiscordRPC.Dev17.csproj
@@ -60,15 +60,10 @@
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
       <IncludeInVSIX>true</IncludeInVSIX>
     </Content>
-    <Content Include="..\VisualStudioDiscordRPC.Shared\extensions_assets_map.json">
-      <Link>extensions_assets_map.json</Link>
-      <IncludeInVSIX>true</IncludeInVSIX>
+    <Content Include="..\VisualStudioDiscordRPC.Shared\Configs\*.*">
+      <Link>Configs\%(Filename).%(Extension)</Link>
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Include="..\VisualStudioDiscordRPC.Shared\vs_assets_map.json">
-      <Link>extensions_assets_map.json</Link>
       <IncludeInVSIX>true</IncludeInVSIX>
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
     <Content Include="..\VisualStudioDiscordRPC.Shared\Translations\*.*">
       <Link>Translations\%(Filename).%(Extension)</Link>
diff --git a/VisualStudioDiscordRPC.Shared/AssetMap/Models/Assets/ExtensionAsset.cs b/VisualStudioDiscordRPC.Shared/AssetMap/Models/Assets/ExtensionAsset.cs
@@ -16,7 +16,7 @@ public ExtensionAsset(string key, string name, IList<string> extensions)
         {
             Key = key ?? throw new ArgumentNullException(nameof(key));
             Name = name ?? throw new ArgumentNullException(nameof(name));
-            Extensions = extensions ?? throw new ArgumentException(nameof(extensions));
+            Extensions = extensions ?? throw new ArgumentNullException(nameof(extensions));
         }
     }
 }
diff --git a/VisualStudioDiscordRPC.Shared/Configs/extensions_assets_map.json b/VisualStudioDiscordRPC.Shared/Configs/extensions_assets_map.json
@@ -138,7 +138,7 @@
     {
         "name": "Shader",
         "key": "shader_file",
-        "extension": [ ".hlsl", ".glsl", ".shader", ".frag", ".vert", ".cg" ]
+        "extensions": [ ".hlsl", ".glsl", ".shader", ".frag", ".vert", ".cg" ]
     }
   ]
 }
diff --git a/VisualStudioDiscordRPC.Shared/Configs/vs_assets_map.json b/VisualStudioDiscordRPC.Shared/Configs/vs_assets_map.json
diff --git a/VisualStudioDiscordRPC.Shared/PackageController.cs b/VisualStudioDiscordRPC.Shared/PackageController.cs
@@ -86,7 +86,7 @@ private void RegisterServices()
             _gitObserver = new GitObserver(_vsObserver);
             ServiceRepository.Default.AddService(_gitObserver);
 
-            // Registering localization service
+            // Registering localization service.
             string translationPath = _settingsService.Read<string>(SettingsKeys.TranslationsPath);
             string currentLanguage = _settingsService.Read<string>(SettingsKeys.Language);
 
diff --git a/VisualStudioDiscordRPC.Shared/Services/PlugService.cs b/VisualStudioDiscordRPC.Shared/Services/PlugService.cs
@@ -19,8 +19,8 @@ namespace VisualStudioDiscordRPC.Shared.Services
 {
     public class PlugService
     {
-        private const string ExtensionAssetMapFilename = "extensions_assets_map.json";
-        private const string VsVersionAssetMapFilename = "vs_assets_map.json";
+        private const string ExtensionAssetMapFilename = "Configs/extensions_assets_map.json";
+        private const string VsVersionAssetMapFilename = "Configs/vs_assets_map.json";
 
         private readonly List<BasePlug> _plugs = new List<BasePlug>();
         private readonly VsObserver _vsObserver = ServiceRepository.Default.GetService<VsObserver>();

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ public ExtensionAsset(string key, string name, IList<string> extensions)`
`16`	`16`	`{`
`17`	`17`	`Key = key ?? throw new ArgumentNullException(nameof(key));`
`18`	`18`	`Name = name ?? throw new ArgumentNullException(nameof(name));`
`19`		`- Extensions = extensions ?? throw new ArgumentException(nameof(extensions));`
	`19`	`+ Extensions = extensions ?? throw new ArgumentNullException(nameof(extensions));`
`20`	`20`	`}`
`21`	`21`	`}`
`22`	`22`	`}`
Original file line number	Diff line number	Diff line change
`@@ -138,7 +138,7 @@`
`138`	`138`	`{`
`139`	`139`	`"name": "Shader",`
`140`	`140`	`"key": "shader_file",`
`141`		`- "extension": [ ".hlsl", ".glsl", ".shader", ".frag", ".vert", ".cg" ]`
	`141`	`+ "extensions": [ ".hlsl", ".glsl", ".shader", ".frag", ".vert", ".cg" ]`
`142`	`142`	`}`
`143`	`143`	`]`
`144`	`144`	`}`
Original file line number	Diff line number	Diff line change
`@@ -19,8 +19,8 @@ namespace VisualStudioDiscordRPC.Shared.Services`
`19`	`19`	`{`
`20`	`20`	`public class PlugService`
`21`	`21`	`{`
`22`		`- private const string ExtensionAssetMapFilename = "extensions_assets_map.json";`
`23`		`- private const string VsVersionAssetMapFilename = "vs_assets_map.json";`
	`22`	`+ private const string ExtensionAssetMapFilename = "Configs/extensions_assets_map.json";`
	`23`	`+ private const string VsVersionAssetMapFilename = "Configs/vs_assets_map.json";`
`24`	`24`
`25`	`25`	`private readonly List<BasePlug> _plugs = new List<BasePlug>();`
`26`	`26`	`private readonly VsObserver _vsObserver = ServiceRepository.Default.GetService<VsObserver>();`