VisualStudio

na1307 · na1307 · commit d0592070661d · 2024-04-26T22:36:06.000+09:00
diff --git a/.github/workflows/vsix.yml b/.github/workflows/vsix.yml
@@ -22,18 +22,18 @@ jobs:
         id: vsix_version
         uses: timheuer/vsix-version-stamp@v2
         with:
-          manifest-file: EncodingConverter.VS\source.extension.vsixmanifest
-          vsix-token-source-file: EncodingConverter.VS\source.extension.cs
+          manifest-file: EncodingConverter.VisualStudio\source.extension.vsixmanifest
+          vsix-token-source-file: EncodingConverter.VisualStudio\source.extension.cs
       - name: Cache NuGet
         uses: actions/cache@v4
         with:
           path: ${{ github.workspace }}\.nuget\packages
           key: ${{ runner.os }}-nuget-${{ hashFiles('**/*.csproj') }} #hash of project files
           restore-keys: ${{ runner.os }}-nuget-
       - name: Build
-        run: msbuild EncodingConverter.VS\EncodingConverter.VS.csproj -r -p:Configuration=Release -p:DeployExtension=false
+        run: msbuild EncodingConverter.VisualStudio\EncodingConverter.VisualStudio.csproj -r -p:Configuration=Release -p:DeployExtension=false
       - name: Upload artifact
         uses: actions/upload-artifact@v4
         with:
           name: ${{ github.event.repository.name }}.vsix
-          path: EncodingConverter.VS/bin/Release/**/*.vsix
+          path: EncodingConverter.VisualStudio/bin/Release/**/*.vsix
diff --git a/EncodingConverter.VisualStudio/Commands/ConvertFileCommand.cs b/EncodingConverter.VisualStudio/Commands/ConvertFileCommand.cs
@@ -2,7 +2,7 @@
 using System.IO;
 using System.Linq;
 
-namespace EncodingConverter;
+namespace EncodingConverter.VisualStudio;
 
 [Command(PackageIds.ConvertFileCommand)]
 internal sealed class ConvertFileCommand : BaseCommand<ConvertFileCommand> {
diff --git a/EncodingConverter.VisualStudio/Commands/ConvertProjectCommand.cs b/EncodingConverter.VisualStudio/Commands/ConvertProjectCommand.cs
@@ -2,7 +2,7 @@
 using System.IO;
 using System.Linq;
 
-namespace EncodingConverter;
+namespace EncodingConverter.VisualStudio;
 
 [Command(PackageIds.ConvertProjectCommand)]
 internal sealed class ConvertProjectCommand : BaseCommand<ConvertProjectCommand> {
diff --git a/EncodingConverter.VisualStudio/Converter.cs b/EncodingConverter.VisualStudio/Converter.cs
@@ -4,7 +4,7 @@
 using System.Linq;
 using System.Text;
 
-namespace EncodingConverter;
+namespace EncodingConverter.VisualStudio;
 
 public static class Converter {
     public static async Task ConvertEncodingAsync(IEnumerable<FileInfo> files, Encoding newEncoding) {
diff --git a/EncodingConverter.VisualStudio/Dialogs/ChooseEncodingDialog.xaml b/EncodingConverter.VisualStudio/Dialogs/ChooseEncodingDialog.xaml
@@ -1,9 +1,9 @@
-﻿<pui:DialogWindow x:Class="EncodingConverter.ChooseEncodingDialog"
+﻿<pui:DialogWindow x:Class="EncodingConverter.VisualStudio.ChooseEncodingDialog"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-             xmlns:local="clr-namespace:EncodingConverter"
+             xmlns:local="clr-namespace:EncodingConverter.VisualStudio"
              xmlns:pui="clr-namespace:Microsoft.VisualStudio.PlatformUI;assembly=Microsoft.VisualStudio.Shell.15.0"
              mc:Ignorable="d"
              Height="150" Width="500" Title="Choose Encoding">
diff --git a/EncodingConverter.VisualStudio/Dialogs/ChooseEncodingDialog.xaml.cs b/EncodingConverter.VisualStudio/Dialogs/ChooseEncodingDialog.xaml.cs
@@ -1,7 +1,7 @@
 ﻿using System.Text;
 using System.Windows;
 
-namespace EncodingConverter;
+namespace EncodingConverter.VisualStudio;
 
 /// <summary>
 /// ChooseEncodingDialog.xaml에 대한 상호 작용 논리
diff --git a/EncodingConverter.VisualStudio/EncodingConverter.VisualStudio.csproj b/EncodingConverter.VisualStudio/EncodingConverter.VisualStudio.csproj
@@ -13,8 +13,8 @@
     <ProjectGuid>{9FFBDABA-E149-4EAF-8E0B-F2C5DFC1AFB5}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>EncodingConverter</RootNamespace>
-    <AssemblyName>EncodingConverter</AssemblyName>
+    <RootNamespace>EncodingConverter.VisualStudio</RootNamespace>
+    <AssemblyName>EncodingConverter.VisualStudio</AssemblyName>
     <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <GeneratePkgDefFile>true</GeneratePkgDefFile>
     <UseCodebase>true</UseCodebase>
diff --git a/EncodingConverter.VisualStudio/EncodingConverterPackage.cs b/EncodingConverter.VisualStudio/EncodingConverterPackage.cs
@@ -5,7 +5,7 @@
 using System.Runtime.InteropServices;
 using System.Threading;
 
-namespace EncodingConverter;
+namespace EncodingConverter.VisualStudio;
 
 [PackageRegistration(UseManagedResourcesOnly = true, AllowsBackgroundLoading = true)]
 [InstalledProductRegistration(Vsix.Name, Vsix.Description, Vsix.Version)]
diff --git a/EncodingConverter.VisualStudio/GlobalSuppressions.cs b/EncodingConverter.VisualStudio/GlobalSuppressions.cs
diff --git a/EncodingConverter.VisualStudio/Properties/AssemblyInfo.cs b/EncodingConverter.VisualStudio/Properties/AssemblyInfo.cs
@@ -1,4 +1,4 @@
-﻿using EncodingConverter;
+﻿using EncodingConverter.VisualStudio;
 using System.Diagnostics.CodeAnalysis;
 using System.Reflection;
 using System.Runtime.InteropServices;
diff --git a/EncodingConverter.VisualStudio/Resources/Icon.png b/EncodingConverter.VisualStudio/Resources/Icon.png
diff --git a/EncodingConverter.VisualStudio/VSCommandTable.cs b/EncodingConverter.VisualStudio/VSCommandTable.cs
@@ -3,7 +3,7 @@
 //     This file was generated by VSIX Synchronizer
 // </auto-generated>
 // ------------------------------------------------------------------------------
-namespace EncodingConverter
+namespace EncodingConverter.VisualStudio
 {
     using System;
     
diff --git a/EncodingConverter.VisualStudio/VSCommandTable.vsct b/EncodingConverter.VisualStudio/VSCommandTable.vsct
diff --git a/EncodingConverter.VisualStudio/source.extension.cs b/EncodingConverter.VisualStudio/source.extension.cs
@@ -3,7 +3,7 @@
 //     This file was generated by VSIX Synchronizer
 // </auto-generated>
 // ------------------------------------------------------------------------------
-namespace EncodingConverter
+namespace EncodingConverter.VisualStudio
 {
     internal sealed partial class Vsix
     {
diff --git a/EncodingConverter.VisualStudio/source.extension.vsixmanifest b/EncodingConverter.VisualStudio/source.extension.vsixmanifest
diff --git a/EncodingConverter.sln b/EncodingConverter.sln
@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.8.34525.116
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EncodingConverter.VS", "EncodingConverter.VS\EncodingConverter.VS.csproj", "{9FFBDABA-E149-4EAF-8E0B-F2C5DFC1AFB5}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EncodingConverter.VisualStudio", "EncodingConverter.VisualStudio\EncodingConverter.VisualStudio.csproj", "{9FFBDABA-E149-4EAF-8E0B-F2C5DFC1AFB5}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-using EncodingConverter;`
	`1`	`+using EncodingConverter.VisualStudio;`
`2`	`2`	`using System.Diagnostics.CodeAnalysis;`
`3`	`3`	`using System.Reflection;`
`4`	`4`	`using System.Runtime.InteropServices;`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`// This file was generated by VSIX Synchronizer`
`4`	`4`	`// </auto-generated>`
`5`	`5`	`// ------------------------------------------------------------------------------`
`6`		`-namespace EncodingConverter`
	`6`	`+namespace EncodingConverter.VisualStudio`
`7`	`7`	`{`
`8`	`8`	`using System;`
`9`	`9`