- changed default packages.config to use python from nuget packages

- the previous standard used by Dave Brotherstone with a local debug build of python is now available as packages_local_pydebug.config - removed 2010 from VS project files - adapted appveyor.yml and github CI accordingly
bruderstein · Aug 22, 2023 · 7dcca50 · 7dcca50
1 parent 4db08df
commit 7dcca50
Show file tree

Hide file tree

Showing 11 changed files with 1,005 additions and 1,033 deletions.
diff --git a/.github/workflows/CI_build.yml b/.github/workflows/CI_build.yml
@@ -5,13 +5,12 @@ on: [push, pull_request]
 jobs:
   build:
 
-    runs-on: windows-2022
+    runs-on: windows-latest
     strategy:
-      max-parallel: 4
       matrix:
         build_configuration: [Release, Debug]
         build_platform: [x64, Win32]
-        
+
     steps:
     - name: Checkout repo
       uses: actions/checkout@v3
@@ -21,17 +20,6 @@ jobs:
     - name: Add msbuild to PATH
       uses: microsoft/setup-msbuild@v1
 
-    - name: "Use CI config files"
-      run: |
-           Write-Host "remove PythonSettings.props" -ForegroundColor Green
-           Remove-Item '.\PythonScript\project\PythonSettings.props'
-           Rename-Item -Path ".\PythonScript\project\PythonSettings_appveyor.props" -NewName "PythonSettings.props"
-           Write-Host "remove packages.config" -ForegroundColor Green
-           Remove-Item '.\PythonScript\project\packages.config'
-           Rename-Item -Path ".\PythonScript\project\packages_appveyor.config" -NewName "packages.config"
-      shell: pwsh
-      working-directory: .
-
     - name: Setup NuGet.exe
       uses: nuget/setup-nuget@v1
 

diff --git a/.github/workflows/msvc_analysis.yml b/.github/workflows/msvc_analysis.yml
@@ -12,7 +12,7 @@ on: [push, pull_request]
 
 jobs:
   Analyze:
-    runs-on: windows-2022
+    runs-on: windows-latest
 
     strategy:
       fail-fast: false
@@ -26,17 +26,6 @@ jobs:
       - name: Add msbuild to PATH
         uses: microsoft/setup-msbuild@v1
 
-      - name: "Use CI config files"
-        run: |
-             Write-Host "remove PythonSettings.props" -ForegroundColor Green
-             Remove-Item '.\PythonScript\project\PythonSettings.props'
-             Rename-Item -Path ".\PythonScript\project\PythonSettings_appveyor.props" -NewName "PythonSettings.props"
-             Write-Host "remove packages.config" -ForegroundColor Green
-             Remove-Item '.\PythonScript\project\packages.config'
-             Rename-Item -Path ".\PythonScript\project\packages_appveyor.config" -NewName "packages.config"
-        shell: pwsh
-        working-directory: .
-
       - name: Setup NuGet.exe
         uses: nuget/setup-nuget@v1
 

diff --git a/PythonScript.sln b/PythonScript.sln
@@ -4,7 +4,7 @@ VisualStudioVersion = 15.0.27130.2036
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NppPlugin", "NppPlugin\project\NppPlugin.vcxproj", "{69CC76EB-0183-4622-929C-02E860A66A23}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PythonScript", "PythonScript\project\PythonScript2010.vcxproj", "{8ACDC1F7-75BD-44CA-9F35-6521DEDC5DF6}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PythonScript", "PythonScript\project\PythonScript.vcxproj", "{8ACDC1F7-75BD-44CA-9F35-6521DEDC5DF6}"
 	ProjectSection(ProjectDependencies) = postProject
 		{69CC76EB-0183-4622-929C-02E860A66A23} = {69CC76EB-0183-4622-929C-02E860A66A23}
 	EndProjectSection

diff --git a/PythonScript/project/PythonScript2010.sln → PythonScript/project/PythonScript.sln b/PythonScript/project/PythonScript2010.sln → PythonScript/project/PythonScript.sln
@@ -1,41 +1,41 @@
-
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PythonScript", "PythonScript2010.vcxproj", "{8ACDC1F7-75BD-44CA-9F35-6521DEDC5DF6}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NppPlugin", "..\..\NppPlugin\project\NppPlugin.vcxproj", "{69CC76EB-0183-4622-929C-02E860A66A23}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
-		Debug-ANSI|Win32 = Debug-ANSI|Win32
-		DebugStartup|Win32 = DebugStartup|Win32
-		Release|Win32 = Release|Win32
-		Release-ANSI|Win32 = Release-ANSI|Win32
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{8ACDC1F7-75BD-44CA-9F35-6521DEDC5DF6}.Debug|Win32.ActiveCfg = Debug|Win32
-		{8ACDC1F7-75BD-44CA-9F35-6521DEDC5DF6}.Debug|Win32.Build.0 = Debug|Win32
-		{8ACDC1F7-75BD-44CA-9F35-6521DEDC5DF6}.Debug-ANSI|Win32.ActiveCfg = Debug-ANSI|Win32
-		{8ACDC1F7-75BD-44CA-9F35-6521DEDC5DF6}.Debug-ANSI|Win32.Build.0 = Debug-ANSI|Win32
-		{8ACDC1F7-75BD-44CA-9F35-6521DEDC5DF6}.DebugStartup|Win32.ActiveCfg = DebugStartup|Win32
-		{8ACDC1F7-75BD-44CA-9F35-6521DEDC5DF6}.DebugStartup|Win32.Build.0 = DebugStartup|Win32
-		{8ACDC1F7-75BD-44CA-9F35-6521DEDC5DF6}.Release|Win32.ActiveCfg = Release|Win32
-		{8ACDC1F7-75BD-44CA-9F35-6521DEDC5DF6}.Release|Win32.Build.0 = Release|Win32
-		{8ACDC1F7-75BD-44CA-9F35-6521DEDC5DF6}.Release-ANSI|Win32.ActiveCfg = Release-ANSI|Win32
-		{8ACDC1F7-75BD-44CA-9F35-6521DEDC5DF6}.Release-ANSI|Win32.Build.0 = Release-ANSI|Win32
-		{69CC76EB-0183-4622-929C-02E860A66A23}.Debug|Win32.ActiveCfg = Debug|Win32
-		{69CC76EB-0183-4622-929C-02E860A66A23}.Debug|Win32.Build.0 = Debug|Win32
-		{69CC76EB-0183-4622-929C-02E860A66A23}.Debug-ANSI|Win32.ActiveCfg = Debug-ANSI|Win32
-		{69CC76EB-0183-4622-929C-02E860A66A23}.Debug-ANSI|Win32.Build.0 = Debug-ANSI|Win32
-		{69CC76EB-0183-4622-929C-02E860A66A23}.DebugStartup|Win32.ActiveCfg = Debug|Win32
-		{69CC76EB-0183-4622-929C-02E860A66A23}.DebugStartup|Win32.Build.0 = Debug|Win32
-		{69CC76EB-0183-4622-929C-02E860A66A23}.Release|Win32.ActiveCfg = Release|Win32
-		{69CC76EB-0183-4622-929C-02E860A66A23}.Release|Win32.Build.0 = Release|Win32
-		{69CC76EB-0183-4622-929C-02E860A66A23}.Release-ANSI|Win32.ActiveCfg = Release-ANSI|Win32
-		{69CC76EB-0183-4622-929C-02E860A66A23}.Release-ANSI|Win32.Build.0 = Release-ANSI|Win32
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
+
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual Studio 2010
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PythonScript", "PythonScript.vcxproj", "{8ACDC1F7-75BD-44CA-9F35-6521DEDC5DF6}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NppPlugin", "..\..\NppPlugin\project\NppPlugin.vcxproj", "{69CC76EB-0183-4622-929C-02E860A66A23}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Win32 = Debug|Win32
+		Debug-ANSI|Win32 = Debug-ANSI|Win32
+		DebugStartup|Win32 = DebugStartup|Win32
+		Release|Win32 = Release|Win32
+		Release-ANSI|Win32 = Release-ANSI|Win32
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{8ACDC1F7-75BD-44CA-9F35-6521DEDC5DF6}.Debug|Win32.ActiveCfg = Debug|Win32
+		{8ACDC1F7-75BD-44CA-9F35-6521DEDC5DF6}.Debug|Win32.Build.0 = Debug|Win32
+		{8ACDC1F7-75BD-44CA-9F35-6521DEDC5DF6}.Debug-ANSI|Win32.ActiveCfg = Debug-ANSI|Win32
+		{8ACDC1F7-75BD-44CA-9F35-6521DEDC5DF6}.Debug-ANSI|Win32.Build.0 = Debug-ANSI|Win32
+		{8ACDC1F7-75BD-44CA-9F35-6521DEDC5DF6}.DebugStartup|Win32.ActiveCfg = DebugStartup|Win32
+		{8ACDC1F7-75BD-44CA-9F35-6521DEDC5DF6}.DebugStartup|Win32.Build.0 = DebugStartup|Win32
+		{8ACDC1F7-75BD-44CA-9F35-6521DEDC5DF6}.Release|Win32.ActiveCfg = Release|Win32
+		{8ACDC1F7-75BD-44CA-9F35-6521DEDC5DF6}.Release|Win32.Build.0 = Release|Win32
+		{8ACDC1F7-75BD-44CA-9F35-6521DEDC5DF6}.Release-ANSI|Win32.ActiveCfg = Release-ANSI|Win32
+		{8ACDC1F7-75BD-44CA-9F35-6521DEDC5DF6}.Release-ANSI|Win32.Build.0 = Release-ANSI|Win32
+		{69CC76EB-0183-4622-929C-02E860A66A23}.Debug|Win32.ActiveCfg = Debug|Win32
+		{69CC76EB-0183-4622-929C-02E860A66A23}.Debug|Win32.Build.0 = Debug|Win32
+		{69CC76EB-0183-4622-929C-02E860A66A23}.Debug-ANSI|Win32.ActiveCfg = Debug-ANSI|Win32
+		{69CC76EB-0183-4622-929C-02E860A66A23}.Debug-ANSI|Win32.Build.0 = Debug-ANSI|Win32
+		{69CC76EB-0183-4622-929C-02E860A66A23}.DebugStartup|Win32.ActiveCfg = Debug|Win32
+		{69CC76EB-0183-4622-929C-02E860A66A23}.DebugStartup|Win32.Build.0 = Debug|Win32
+		{69CC76EB-0183-4622-929C-02E860A66A23}.Release|Win32.ActiveCfg = Release|Win32
+		{69CC76EB-0183-4622-929C-02E860A66A23}.Release|Win32.Build.0 = Release|Win32
+		{69CC76EB-0183-4622-929C-02E860A66A23}.Release-ANSI|Win32.ActiveCfg = Release-ANSI|Win32
+		{69CC76EB-0183-4622-929C-02E860A66A23}.Release-ANSI|Win32.Build.0 = Release-ANSI|Win32
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal