fix generator when switching plattform

.config/dotnet-tools.json

@@ -1,10 +1,12 @@
 {
-    "version": 1,
-    "isRoot": true,
-    "tools": {
-        "jetbrains.resharper.globaltools": {
-            "version": "2023.2.2",
-            "commands": ["jb"]
-        }
+  "version": 1,
+  "isRoot": true,
+  "tools": {
+    "jetbrains.resharper.globaltools": {
+      "version": "2023.3.3",
+      "commands": [
+        "jb"
+      ]
     }
-}
+  }
+}

.github/actions/update-upm-packages/update-upm-packages.ps1

@@ -10,42 +10,15 @@ param (
     [string]
     $ProjectPath,
 
-    [Parameter(Mandatory = $true,
-        HelpMessage = "List of pattern used to determine packages that can't be updated.")]
-    [string[]]
-    $ExcludedPackagePatterns,
-
     [Parameter(Mandatory = $true,
         HelpMessage = 'List of package.json files that should also be updated with the new version numbers.')]
     [string[]]
     $PackageJsonFilesToUpdate
 )
 
 $ErrorActionPreference = 'Stop'
-$UnityPackageRepositoryBaseUrl = 'https://packages.unity.com'
-
-function Test-Any {
-    param (
-        [Parameter(Mandatory = $true)]
-        $EvaluateCondition,
-        [Parameter(Mandatory = $true, ValueFromPipeline = $true)]
-        $ObjectToTest
-    )
-    begin {
-        $any = $false
-    }
-    process {
-        if (-not $any -and (& $EvaluateCondition $ObjectToTest)) {
-            $any = $true
-        }
-    }
-    end {
-        $any
-    }
-}
 
 $ProjectPath = $ProjectPath.Trim()
-$ExcludedPackagePatterns = $ExcludedPackagePatterns | ForEach-Object { $_.Trim() }
 $PackageJsonFilesToUpdate = $PackageJsonFilesToUpdate | ForEach-Object { $_.Trim() }
 $oldLocation = Get-Location
 try {
@@ -55,18 +28,29 @@ try {
         throw "One of the provided package.json files doesn't exists: ['$($PackageJsonFilesToUpdate -join "'; '")']"
     }
 
-    $manifestObject = Get-Content -Path 'Packages\manifest.json' -Encoding utf8 | ConvertFrom-Json
+    $manifestObject = Get-Content -Path 'Packages\manifest.json' -Encoding utf8 | ConvertFrom-Json -Depth 10
+    $packagesLockObject = Get-Content -Path "Packages\packages-lock.json" -Encoding utf8 | ConvertFrom-Json -Depth 10
     $availableUpdates = New-Object Collections.Generic.List[PsObject]
     foreach ($dependency in $manifestObject.dependencies.PsObject.Properties) {
         $packageName = $dependency.Name
         $currentVersion = $dependency.Value
-        if ($ExcludedPackagePatterns | Test-Any { $_ -like $packageName }) {
+        $packageLockData = $packagesLockObject.dependencies.PsObject.Properties[$packageName].Value
+        if ($packageLockData.source -ne 'registry') {
             continue
         }
 
-        $repositoryBaseUrl = $UnityPackageRepositoryBaseUrl
-        $packageMetadata = Invoke-WebRequest -Uri "$repositoryBaseUrl/$packageName" | ConvertFrom-Json
+        $repositoryBaseUrl = $packageLockData.url
+        $packageMetadata = Invoke-WebRequest -Uri "$repositoryBaseUrl/$packageName" | ConvertFrom-Json -Depth 10
         $latestVersion = $packageMetadata.'dist-tags'.latest
+        if ($currentVersion.Contains('-')) {
+            # current is pre-release -> allow pre-release
+            $latestVersion = $packageMetadata.'dist-tags'.latest
+        }
+        else {
+            $latestVersion = ($packageMetadata.versions.PsObject.Properties | Where-Object { -not $_.Name.Contains('-') } |
+                ForEach-Object { [System.Version]::Parse($_.Name) } | Sort-Object -Descending | Select-Object -First 1).ToString()
+        }
+
         if ([System.String]::IsNullOrEmpty($latestVersion)) {
             throw "Failed to get latest version number for package: '$packageName'. Received the following from the registry: '$repositoryBaseUrl': $packageMetadata"
         }
@@ -88,7 +72,7 @@ try {
     }
 
     Write-Host "Update Packages/manifest.json of Unity project at: '$ProjectPath'"
-    ConvertTo-Json -InputObject $manifestObject | Set-Content -Path 'Packages\manifest.json' -Encoding utf8
+    ConvertTo-Json -InputObject $manifestObject -Depth 10  | Set-Content -Path 'Packages\manifest.json' -Encoding utf8
 
     foreach ($packageJsonFile in $PackageJsonFilesToUpdate) {
         $packageJsonContent = Get-Content -Path $packageJsonFile -Encoding utf8

src/TestProjects/RootTestProject/Packages/manifest.json

@@ -1,5 +1,6 @@
 {
   "dependencies": {
-    "com.github-joc0de.visual-studio-solution-generator": "file:../../../UnityVisualStudioSolutionGenerator/Assets"
+    "com.github-joc0de.visual-studio-solution-generator": "file:../../../UnityVisualStudioSolutionGenerator/Assets",
+    "com.unity.modules.accessibility": "1.0.0"
   }
 }

src/TestProjects/RootTestProject/Packages/packages-lock.json

@@ -5,19 +5,19 @@
       "depth": 0,
       "source": "local",
       "dependencies": {
-        "com.unity.ide.visualstudio": "2.0.20",
+        "com.unity.ide.visualstudio": "2.0.22",
         "com.unity.settings-manager": "2.0.1"
       }
     },
     "com.unity.ext.nunit": {
-      "version": "2.0.3",
+      "version": "2.0.5",
       "depth": 3,
       "source": "registry",
       "dependencies": {},
       "url": "https://packages.unity.com"
     },
     "com.unity.ide.visualstudio": {
-      "version": "2.0.20",
+      "version": "2.0.22",
       "depth": 1,
       "source": "registry",
       "dependencies": {
@@ -33,7 +33,7 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.test-framework": {
-      "version": "1.3.7",
+      "version": "1.3.9",
       "depth": 2,
       "source": "registry",
       "dependencies": {
@@ -43,6 +43,12 @@
       },
       "url": "https://packages.unity.com"
     },
+    "com.unity.modules.accessibility": {
+      "version": "1.0.0",
+      "depth": 0,
+      "source": "builtin",
+      "dependencies": {}
+    },
     "com.unity.modules.imgui": {
       "version": "1.0.0",
       "depth": 3,

src/TestProjects/RootTestProject/ProjectSettings/MultiplayerManager.asset

@@ -0,0 +1,7 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!655991488 &1
+MultiplayerManager:
+  m_ObjectHideFlags: 0
+  m_EnableMultiplayerRoles: 0
+  m_ActiveMultiplayerRole: 0

src/TestProjects/RootTestProject/ProjectSettings/Packages/com.github-joc0de.visual-studio-solution-generator/Settings.json

@@ -16,6 +16,21 @@
                 "key": "general.LogVerbose",
                 "value": "{\"m_Value\":false}"
             },
+            {
+                "type": "System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089",
+                "key": "general.GenerateReSharperProjectSettings",
+                "value": "{\"m_Value\":false}"
+            },
+            {
+                "type": "System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089",
+                "key": "general.TrackMetaDeletion",
+                "value": "{\"m_Value\":false}"
+            },
+            {
+                "type": "System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089",
+                "key": "general.EnableNullableReferenceTypes",
+                "value": "{\"m_Value\":false}"
+            },
             {
                 "type": "System.Collections.Generic.List`1[[System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089]], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089",
                 "key": "legacy-style.ExcludedAnalyzers",
@@ -27,7 +42,12 @@
                 "value": "{\"m_Value\":[\"**/*.meta\",\"**/*.asset\",\"**/*.prefab\"]}"
             },
             {
-                "type": "System.Collections.Generic.List`1[[UnityVisualStudioSolutionGenerator.PropertyGroupSetting, UnityVisualStudioSolutionGenerator, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089",
+                "type": "System.Collections.Generic.List`1[[System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089]], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089",
+                "key": "general.AdditionalIncludedSolutions",
+                "value": "{\"m_Value\":[]}"
+            },
+            {
+                "type": "System.Collections.Generic.List`1[[UnityVisualStudioSolutionGenerator.Configuration.PropertyGroupSetting, UnityVisualStudioSolutionGenerator, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089",
                 "key": "sdk-style.SdkAdditionalProperties",
                 "value": "{\"m_Value\":[{\"<Name>k__BackingField\":\"EnableNETAnalyzers\",\"<Value>k__BackingField\":\"true\"},{\"<Name>k__BackingField\":\"AnalysisLevel\",\"<Value>k__BackingField\":\"latest\"},{\"<Name>k__BackingField\":\"AnalysisMode\",\"<Value>k__BackingField\":\"AllEnabledByDefault\"}]}"
             }