diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 1ec3ea9..687f39e 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -26,13 +26,6 @@ jobs: steps: - uses: actions/checkout@v4 - - name: Setup .NET build dependencies - uses: timheuer/bootstrap-dotnet@v2 - with: - nuget: 'false' - sdk: 'false' - msbuild: 'true' - - name: Increment VSIX version id: vsix_version uses: timheuer/vsix-version-stamp@v2 @@ -41,7 +34,7 @@ jobs: vsix-token-source-file: ${{ env.VsixManifestSourcePath }} - name: Build - run: msbuild /v:m -restore /p:OutDir=\_built + run: dotnet build ./StringResourceVisualizer.slnx --configuration ${{ env.Configuration }} -p:OutDir=\_built -v:m - name: Upload artifact uses: actions/upload-artifact@v4 diff --git a/Directory.Build.props b/Directory.Build.props index d374d47..6aba77f 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,6 +1,6 @@  - 12.0 + 14.0 diff --git a/Directory.Packages.props b/Directory.Packages.props new file mode 100644 index 0000000..8b81ec6 --- /dev/null +++ b/Directory.Packages.props @@ -0,0 +1,36 @@ + + + + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/StringResourceVisualizer.sln b/StringResourceVisualizer.sln deleted file mode 100644 index 90c2db1..0000000 --- a/StringResourceVisualizer.sln +++ /dev/null @@ -1,38 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.1.32104.313 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StringResourceVisualizer", "src\StringResourceVisualizer.csproj", "{E71A6E00-D6F7-4401-9515-1DD72701EC57}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{F0206BFC-99B1-481B-8248-F4C4995858FC}" - ProjectSection(SolutionItems) = preProject - .editorconfig = .editorconfig - CHANGELOG.md = CHANGELOG.md - README.md = README.md - EndProjectSection -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StringResourceVisualizer.Tests", "src\StringResourceVisualizer.Tests\StringResourceVisualizer.Tests.csproj", "{B36B6804-3DE4-4C5B-9727-25F053CBA7AC}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {E71A6E00-D6F7-4401-9515-1DD72701EC57}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E71A6E00-D6F7-4401-9515-1DD72701EC57}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E71A6E00-D6F7-4401-9515-1DD72701EC57}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E71A6E00-D6F7-4401-9515-1DD72701EC57}.Release|Any CPU.Build.0 = Release|Any CPU - {B36B6804-3DE4-4C5B-9727-25F053CBA7AC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B36B6804-3DE4-4C5B-9727-25F053CBA7AC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B36B6804-3DE4-4C5B-9727-25F053CBA7AC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B36B6804-3DE4-4C5B-9727-25F053CBA7AC}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {CD6B32D1-9303-4C28-8469-72A05632ABE0} - EndGlobalSection -EndGlobal diff --git a/StringResourceVisualizer.slnx b/StringResourceVisualizer.slnx new file mode 100644 index 0000000..6a8bd72 --- /dev/null +++ b/StringResourceVisualizer.slnx @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/src/StringResourceVisualizer.Tests/StringResourceVisualizer.Tests.csproj b/src/StringResourceVisualizer.Tests/StringResourceVisualizer.Tests.csproj index 82e550c..0f3f16d 100644 --- a/src/StringResourceVisualizer.Tests/StringResourceVisualizer.Tests.csproj +++ b/src/StringResourceVisualizer.Tests/StringResourceVisualizer.Tests.csproj @@ -1,105 +1,32 @@ - - - + + - Debug - AnyCPU - {B36B6804-3DE4-4C5B-9727-25F053CBA7AC} - Library - Properties - StringResourceVisualizer.Tests - StringResourceVisualizer.Tests - v4.8.1 - 512 - {3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - 15.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - $(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages - False - UnitTest - - - + net481 + + false + + false - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - - - - - - - + - - 2.5.192 - - - 4.11.0 - - - 4.11.0 - - - 6.1.0 - - - 4.7.36 - - - 4.11.0 - - - 3.6.3 - - - 3.6.3 - - - 3.6.3 - runtime; build; native; contentfiles; analyzers; buildtransitive - all - - - 2.20.17 - - - 8.0.0 - - - 9.0.0 - - - 9.0.0 - - - 1.7.0 - runtime; build; native; contentfiles; analyzers; buildtransitive - all - + + + + + + + + + + + + + + + - - {e71a6e00-d6f7-4401-9515-1dd72701ec57} - StringResourceVisualizer - + - - + \ No newline at end of file diff --git a/src/StringResourceVisualizer.csproj b/src/StringResourceVisualizer.csproj index 2063845..bae55a7 100644 --- a/src/StringResourceVisualizer.csproj +++ b/src/StringResourceVisualizer.csproj @@ -1,182 +1,83 @@ - - + + - 15.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - true - - - - true - - - - - - - - Debug - AnyCPU - 2.0 - {82b43b9b-a64c-4715-b499-d71e9ca2bd60};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - {E71A6E00-D6F7-4401-9515-1DD72701EC57} - Library - Properties - StringResourceVisualizer - StringResourceVisualizer - v4.8.1 + net481 + StringResourceVisualizer.ruleset + + $(DefaultItemExcludes);StringResourceVisualizer.Tests\** + + + false + + false + + false + + + true true - true + true true true - true - false - Program - $(DevEnvDir)devenv.exe - /rootsuffix Exp - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - StringResourceVisualizer.ruleset - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - StringResourceVisualizer.ruleset + + + + + - - - - - - - - - + Component - - - - - + True True source.extension.vsixmanifest - - - - - - - - - Resources\LICENSE - true - - - .editorconfig - - - - + Designer VsixManifestGenerator source.extension.cs - + + - + + PreserveNewest true - - - 2.5.192 - - - 2.22.0 - - - 4.11.0 - - - 4.11.0 - - - 6.1.0 - - - 4.7.36 - - - 4.11.0 - - - 17.10.40171 - - - 2.20.17 - - - 8.0.0 - - - 4.3.0 - - - 9.0.0 - - - 4.3.0 - - - 9.0.0 - - - 1.7.0 - runtime; build; native; contentfiles; analyzers; buildtransitive - all - - + - - - + + + + + + + + + + + + + + + + + + + + - - - This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - + \ No newline at end of file diff --git a/src/signvsix.targets b/src/signvsix.targets index e34fba6..d341271 100644 --- a/src/signvsix.targets +++ b/src/signvsix.targets @@ -1,6 +1,7 @@ - + +