From eca10d8bf39bbbdc29b06c6149be6aad56194c36 Mon Sep 17 00:00:00 2001 From: John Date: Sat, 21 Oct 2023 01:39:11 -0500 Subject: [PATCH] Fix cosmos build and recongition error --- .../Cosmos.Build.Builder/packages.lock.json | 63 +++++++++++++++++++ source/Cosmos.Build.Tasks/packages.lock.json | 2 +- .../Cosmos.Deploy.Pixie.csproj | 2 +- source/Cosmos.Deploy.Pixie/packages.lock.json | 2 +- .../Cosmos.Deploy.USB.csproj | 2 +- source/Cosmos.Deploy.USB/packages.lock.json | 2 +- .../Cosmos.VS.DebugEngine.csproj | 2 +- .../Cosmos.VS.DebugEngine/packages.lock.json | 2 +- .../Cosmos.VS.ProjectSystem.csproj | 2 +- .../packages.lock.json | 2 +- .../Cosmos.VS.Windows.csproj | 2 +- source/Cosmos.VS.Windows/packages.lock.json | 2 +- 12 files changed, 74 insertions(+), 11 deletions(-) create mode 100644 source/Cosmos.Build.Builder/packages.lock.json diff --git a/source/Cosmos.Build.Builder/packages.lock.json b/source/Cosmos.Build.Builder/packages.lock.json new file mode 100644 index 0000000000..26d86db5ec --- /dev/null +++ b/source/Cosmos.Build.Builder/packages.lock.json @@ -0,0 +1,63 @@ +{ + "version": 1, + "dependencies": { + ".NETFramework,Version=v4.7.2": { + "Microsoft.VisualStudio.Setup.Configuration.Interop": { + "type": "Direct", + "requested": "[1.16.30, )", + "resolved": "1.16.30", + "contentHash": "lC6SqNkraWUSY7cyF5GUmXSECoTMwslBc/r1dguChjsi0D0BlF7G6PLsvXD0NFCwnpKlgVzUYrIq7DQakdGerw==" + }, + "Newtonsoft.Json": { + "type": "Direct", + "requested": "[13.0.1, )", + "resolved": "13.0.1", + "contentHash": "ppPFpBcvxdsfUonNcvITKqLl3bqxWbDCZIzDWHzjpdAHRFfZe0Dw9HmA0+za13IdyrgJwpkDTDA9fHaxOrt20A==" + }, + "NuGet.Common": { + "type": "Direct", + "requested": "[5.9.1, )", + "resolved": "5.9.1", + "contentHash": "BRX0V8k8QXcEWL33V2HcBU1+eu/Qp5LDJlheYFSZ03hKjlHVHFfLquvUUYLgSNO7tiBxCFe7pTSgO4XanyzteQ==", + "dependencies": { + "NuGet.Frameworks": "5.9.1" + } + }, + "NuGet.Configuration": { + "type": "Direct", + "requested": "[5.9.1, )", + "resolved": "5.9.1", + "contentHash": "dpjLDYEuhR1J8L3s9c1qVHEBaWqFI2/x3qRmhqVYDLB5B9ETVe1jVkxLkFQreQVgh+N5cVgtZWx1jGuArj7QaQ==", + "dependencies": { + "NuGet.Common": "5.9.1" + } + }, + "System.Runtime.WindowsRuntime": { + "type": "Direct", + "requested": "[4.6.0, )", + "resolved": "4.6.0", + "contentHash": "IWrs1TmbxP65ZZjIglNyvDkFNoV5q2Pofg5WO7I8RKQOpLdFprQSh3xesOoClBqR4JHr4nEB1Xk1MqLPW1jPuQ==" + }, + "WPF-UI": { + "type": "Direct", + "requested": "[2.0.3, )", + "resolved": "2.0.3", + "contentHash": "1e9Q8pQGfi9YFp3WavKZjXyLYohIjXxk5q0NqEaamofVgIdxRxwqrkWha584FBUISRBBT/qFOrl97YBl5bs30Q==", + "dependencies": { + "System.Drawing.Common": "6.0.0" + } + }, + "NuGet.Frameworks": { + "type": "Transitive", + "resolved": "5.9.1", + "contentHash": "LuJA875MQpPMdik6KUsDUnEDSXWX+T/sExFikA0A5zGFkEW37weP5b6NxljWlrw4UNOWTgmTeumm802Jwz20sw==" + }, + "System.Drawing.Common": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "NfuoKUiP2nUWwKZN6twGqXioIe1zVD0RIj2t976A+czLHr2nY454RwwXs6JU9Htc6mwqL6Dn/nEL3dpVf2jOhg==" + } + }, + ".NETFramework,Version=v4.7.2/win7-x86": {} + } +} \ No newline at end of file diff --git a/source/Cosmos.Build.Tasks/packages.lock.json b/source/Cosmos.Build.Tasks/packages.lock.json index ed1497bc38..2fb2ccf38b 100644 --- a/source/Cosmos.Build.Tasks/packages.lock.json +++ b/source/Cosmos.Build.Tasks/packages.lock.json @@ -255,7 +255,7 @@ } } }, - ".NETFramework,Version=v4.8/win-x86": { + ".NETFramework,Version=v4.8/win-x64": { "Microsoft.Win32.Registry": { "type": "Transitive", "resolved": "5.0.0", diff --git a/source/Cosmos.Deploy.Pixie/Cosmos.Deploy.Pixie.csproj b/source/Cosmos.Deploy.Pixie/Cosmos.Deploy.Pixie.csproj index b8f6b25478..0f68568869 100644 --- a/source/Cosmos.Deploy.Pixie/Cosmos.Deploy.Pixie.csproj +++ b/source/Cosmos.Deploy.Pixie/Cosmos.Deploy.Pixie.csproj @@ -2,7 +2,7 @@ net6.0-windows - win-x86 + win-x64 WinExe Cosmos.ico true diff --git a/source/Cosmos.Deploy.Pixie/packages.lock.json b/source/Cosmos.Deploy.Pixie/packages.lock.json index 2c01469890..60015fb90a 100644 --- a/source/Cosmos.Deploy.Pixie/packages.lock.json +++ b/source/Cosmos.Deploy.Pixie/packages.lock.json @@ -2,6 +2,6 @@ "version": 1, "dependencies": { "net6.0-windows7.0": {}, - "net6.0-windows7.0/win-x86": {} + "net6.0-windows7.0/win-x64": {} } } \ No newline at end of file diff --git a/source/Cosmos.Deploy.USB/Cosmos.Deploy.USB.csproj b/source/Cosmos.Deploy.USB/Cosmos.Deploy.USB.csproj index 04570f7886..cebfd48b0c 100644 --- a/source/Cosmos.Deploy.USB/Cosmos.Deploy.USB.csproj +++ b/source/Cosmos.Deploy.USB/Cosmos.Deploy.USB.csproj @@ -2,7 +2,7 @@ net6.0-windows - win-x86 + win-x64 WinExe Cosmos.ico true diff --git a/source/Cosmos.Deploy.USB/packages.lock.json b/source/Cosmos.Deploy.USB/packages.lock.json index 8ce2fc3c0a..05293d41e1 100644 --- a/source/Cosmos.Deploy.USB/packages.lock.json +++ b/source/Cosmos.Deploy.USB/packages.lock.json @@ -37,7 +37,7 @@ } } }, - "net6.0-windows7.0/win-x86": { + "net6.0-windows7.0/win-x64": { "Microsoft.Win32.Registry": { "type": "Transitive", "resolved": "5.0.0", diff --git a/source/Cosmos.VS.DebugEngine/Cosmos.VS.DebugEngine.csproj b/source/Cosmos.VS.DebugEngine/Cosmos.VS.DebugEngine.csproj index 899455632e..c31a336058 100644 --- a/source/Cosmos.VS.DebugEngine/Cosmos.VS.DebugEngine.csproj +++ b/source/Cosmos.VS.DebugEngine/Cosmos.VS.DebugEngine.csproj @@ -2,7 +2,7 @@ net48 - win-x86 + win-x64 diff --git a/source/Cosmos.VS.DebugEngine/packages.lock.json b/source/Cosmos.VS.DebugEngine/packages.lock.json index 0b30808d9e..9106078d6a 100644 --- a/source/Cosmos.VS.DebugEngine/packages.lock.json +++ b/source/Cosmos.VS.DebugEngine/packages.lock.json @@ -1330,7 +1330,7 @@ } } }, - ".NETFramework,Version=v4.8/win-x86": { + ".NETFramework,Version=v4.8/win-x64": { "Microsoft.Win32.Registry": { "type": "Direct", "requested": "[5.0.0, )", diff --git a/source/Cosmos.VS.ProjectSystem/Cosmos.VS.ProjectSystem.csproj b/source/Cosmos.VS.ProjectSystem/Cosmos.VS.ProjectSystem.csproj index 38d5baf387..667fcfc664 100644 --- a/source/Cosmos.VS.ProjectSystem/Cosmos.VS.ProjectSystem.csproj +++ b/source/Cosmos.VS.ProjectSystem/Cosmos.VS.ProjectSystem.csproj @@ -2,7 +2,7 @@ net48 - win-x86 + win-x64 Cosmos.VS.ProjectSystem 1.0.0.0 1.0.0.0 diff --git a/source/Cosmos.VS.ProjectSystem/packages.lock.json b/source/Cosmos.VS.ProjectSystem/packages.lock.json index 9a19fc4c81..e9d66a1c0f 100644 --- a/source/Cosmos.VS.ProjectSystem/packages.lock.json +++ b/source/Cosmos.VS.ProjectSystem/packages.lock.json @@ -1347,7 +1347,7 @@ } } }, - ".NETFramework,Version=v4.8/win-x86": { + ".NETFramework,Version=v4.8/win-x64": { "Microsoft.Win32.Registry": { "type": "Direct", "requested": "[5.0.0, )", diff --git a/source/Cosmos.VS.Windows/Cosmos.VS.Windows.csproj b/source/Cosmos.VS.Windows/Cosmos.VS.Windows.csproj index c55c398a92..a75f3b79cd 100644 --- a/source/Cosmos.VS.Windows/Cosmos.VS.Windows.csproj +++ b/source/Cosmos.VS.Windows/Cosmos.VS.Windows.csproj @@ -2,7 +2,7 @@ net48 - win-x86 + win-x64 Cosmos.VS.Windows False False diff --git a/source/Cosmos.VS.Windows/packages.lock.json b/source/Cosmos.VS.Windows/packages.lock.json index 27c86edd00..d86b3f9715 100644 --- a/source/Cosmos.VS.Windows/packages.lock.json +++ b/source/Cosmos.VS.Windows/packages.lock.json @@ -1136,7 +1136,7 @@ } } }, - ".NETFramework,Version=v4.8/win-x86": { + ".NETFramework,Version=v4.8/win-x64": { "Microsoft.Win32.Primitives": { "type": "Transitive", "resolved": "4.3.0",