diff --git a/.gitignore b/.gitignore index 82a9e5e2b..5a2131056 100644 --- a/.gitignore +++ b/.gitignore @@ -425,3 +425,5 @@ hwc.gen/ #DCP export dcp_export/ + +*.apax.tgz \ No newline at end of file diff --git a/scripts/check_requisites.ps1 b/scripts/check_requisites.ps1 index c0413135c..f0fc448b8 100644 --- a/scripts/check_requisites.ps1 +++ b/scripts/check_requisites.ps1 @@ -239,11 +239,81 @@ To manually add the GitHub NuGet feed to your sources: 1. Generate a Personal Access Token on GitHub with 'read:packages', 'write:packages', and 'delete:packages' (if needed) permissions. 2. Open a command prompt or terminal. 3. Use the following command to add the feed to your NuGet sources: - nuget sources Add -Name "GitHub" -Source "$feedUrl" -Username [YOUR_GITHUB_USERNAME] -Password [YOUR_PERSONAL_ACCESS_TOKEN] - -Replace [YOUR_GITHUB_USERNAME] with your actual GitHub username and [YOUR_PERSONAL_ACCESS_TOKEN] with the token you generated. + dotnet nuget add source --username [YOUR_GITHUB_USERNAME] --password [YOUR_PERSONAL_ACCESS_TOKEN] --store-password-in-clear-text --name gh-packages-ix-ax "https://nuget.pkg.github.com/ix-ax/index.json" + + Replace [YOUR_GITHUB_USERNAME] with your actual GitHub username and [YOUR_PERSONAL_ACCESS_TOKEN] with the token you generated. Note: Treat your personal access token like a password. Keep it secure and do not share it. "@ Write-Host "You need to add the GitHub NuGet feed to your sources manually." $nugetGuide -} \ No newline at end of file +} + +# Function to download VS Build Tools +function Download-VSBuildTools { + $url = "https://aka.ms/vs/16/release/vs_buildtools.exe" + $output = "vs_buildtools.exe" + + Write-Host "Downloading Visual Studio Build Tools..." + Invoke-WebRequest -Uri $url -OutFile $output + + if (Test-Path $output) { + Write-Host "Visual Studio Build Tools downloaded successfully." + } else { + Write-Host "Failed to download Visual Studio Build Tools." + exit 1 + } +} + +# Function to install VS Build Tools +function Install-VSBuildTools { + Write-Host "Installing Visual Studio Build Tools..." + + #Start-Process -FilePath ".\vs_buildtools.exe --wait --norestart --nocache --passive --add Microsoft.VisualStudio.Workload.VCTools --add Microsoft.VisualStudio.Component.VC.Tools.x86.x64 --add Microsoft.VisualStudio.Component.Windows10SDK --add Microsoft.VisualStudio.Component.Windows10SDK.18362" -Wait + .\vs_buildtools.exe --wait --norestart --nocache --passive --add Microsoft.VisualStudio.Workload.VCTools --add Microsoft.VisualStudio.Component.VC.Tools.x86.x64 --add Microsoft.VisualStudio.Component.Windows10SDK --add Microsoft.VisualStudio.Component.Windows10SDK.18362 + Write-Host "Visual Studio Build Tools installation completed." +} + +# Expected path from the environment variable +$expectedVCToolsInstallDir = "C:\Program Files (x86)\Microsoft Visual Studio\2019\BuildTools\VC\Tools\MSVC\14.29.30133" + +# Check if the environment variable exists +$vctoolsDir = [System.Environment]::GetEnvironmentVariable("VCToolsInstallDir", [System.EnvironmentVariableTarget]::Machine) + +if ($vctoolsDir -and (Test-Path $vctoolsDir)) { + # If the environment variable exists and the path is valid + Write-Host "VCToolsInstallDir is set and the path exists: $vctoolsDir" -foregroundcolor green +} else { + # If the environment variable doesn't exist or the path is invalid + Write-Host "VCToolsInstallDir is not set correctly or the path does not exist." -foregroundcolor red + + # Prompt the user to confirm installation + $userResponse = Read-Host "Would you like to download and install Visual Studio Build Tools? (Y/N)" + + if ($userResponse -eq 'Y' -or $userResponse -eq 'y') { + # If the user confirms, download and install Visual Studio Build Tools + Download-VSBuildTools + Install-VSBuildTools + + try + { + # Set the environment variable after installation + [System.Environment]::SetEnvironmentVariable("VCToolsInstallDir", $expectedVCToolsInstallDir, [System.EnvironmentVariableTarget]::Machine) + } + catch + { + Write-Host "Failed to set VCToolsInstallDir environment variable or path. You will need to set it manually." -foregroundcolor red + Write-Host "VCToolsInstallDir = $expectedVCToolsInstallDir" -foregroundcolor red + } + # Verify that the environment variable and path are now correct + $finalVCToolsInstallDir = [System.Environment]::GetEnvironmentVariable("VCToolsInstallDir", [System.EnvironmentVariableTarget]::Machine) + + if ($finalVCToolsInstallDir -eq $expectedVCToolsInstallDir -and (Test-Path $finalVCToolsInstallDir)) { + Write-Host "VCToolsInstallDir is now set correctly: $finalVCToolsInstallDir" + } else { + Write-Host "Failed to set VCToolsInstallDir environment variable or path." + } + } else { + # If the user declines installation + Write-Host "Installation aborted by the user." + } +} diff --git a/src/AXOpen-L1-tests.sln b/src/AXOpen-L1-tests.sln index 1adf69d4b..960587848 100644 --- a/src/AXOpen-L1-tests.sln +++ b/src/AXOpen-L1-tests.sln @@ -1,5 +1,5 @@ Microsoft Visual Studio Solution File, Format Version 12.00 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen-L1-tests", "AXOpen-L1-tests.proj", "{091BFA68-B549-45AF-9857-3932996D7C60}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AXOpen-L1-tests", "AXOpen-L1-tests.proj", "{091BFA68-B549-45AF-9857-3932996D7C60}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ix_ax_axopen_abstractions", "abstractions\src\AXOpen.Abstractions\ix_ax_axopen_abstractions.csproj", "{02DDDB95-D6BC-4718-BA35-3454EAB5DF67}" EndProject @@ -165,8 +165,7 @@ Global GlobalSection(ProjectConfigurationPlatforms) = postSolution {091BFA68-B549-45AF-9857-3932996D7C60}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {091BFA68-B549-45AF-9857-3932996D7C60}.Debug|Any CPU.Build.0 = Debug|Any CPU - {091BFA68-B549-45AF-9857-3932996D7C60}.Release|Any CPU.ActiveCfg = Release|Any CPU - {091BFA68-B549-45AF-9857-3932996D7C60}.Release|Any CPU.Build.0 = Release|Any CPU + {091BFA68-B549-45AF-9857-3932996D7C60}.Release|Any CPU.ActiveCfg = Debug|Any CPU {02DDDB95-D6BC-4718-BA35-3454EAB5DF67}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {02DDDB95-D6BC-4718-BA35-3454EAB5DF67}.Debug|Any CPU.Build.0 = Debug|Any CPU {02DDDB95-D6BC-4718-BA35-3454EAB5DF67}.Release|Any CPU.ActiveCfg = Release|Any CPU diff --git a/src/AXOpen-L2-tests.sln b/src/AXOpen-L2-tests.sln index 70ab561ec..2eb865ea3 100644 --- a/src/AXOpen-L2-tests.sln +++ b/src/AXOpen-L2-tests.sln @@ -1,16 +1,13 @@ Microsoft Visual Studio Solution File, Format Version 12.00 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen-L2-tests", "AXOpen-L2-tests.proj", "{9A85BB89-8946-42C7-AEEC-C777BBE31FCA}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AXOpen-L2-tests", "AXOpen-L2-tests.proj", "{9A85BB89-8946-42C7-AEEC-C777BBE31FCA}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {9A85BB89-8946-42C7-AEEC-C777BBE31FCA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {9A85BB89-8946-42C7-AEEC-C777BBE31FCA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9A85BB89-8946-42C7-AEEC-C777BBE31FCA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9A85BB89-8946-42C7-AEEC-C777BBE31FCA}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/src/AXOpen-L3-tests.sln b/src/AXOpen-L3-tests.sln index 40e0fb7bb..085acb780 100644 --- a/src/AXOpen-L3-tests.sln +++ b/src/AXOpen-L3-tests.sln @@ -1,5 +1,5 @@ Microsoft Visual Studio Solution File, Format Version 12.00 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen-L3-tests", "AXOpen-L3-tests.proj", "{6D090A35-7564-4D14-8531-7081D858A4F3}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AXOpen-L3-tests", "AXOpen-L3-tests.proj", "{6D090A35-7564-4D14-8531-7081D858A4F3}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ix_ax_axopen_abstractions", "abstractions\src\AXOpen.Abstractions\ix_ax_axopen_abstractions.csproj", "{64E2240B-1DFE-4939-BB2C-8A40FB81329D}" EndProject @@ -199,8 +199,7 @@ Global GlobalSection(ProjectConfigurationPlatforms) = postSolution {6D090A35-7564-4D14-8531-7081D858A4F3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {6D090A35-7564-4D14-8531-7081D858A4F3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6D090A35-7564-4D14-8531-7081D858A4F3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6D090A35-7564-4D14-8531-7081D858A4F3}.Release|Any CPU.Build.0 = Release|Any CPU + {6D090A35-7564-4D14-8531-7081D858A4F3}.Release|Any CPU.ActiveCfg = Debug|Any CPU {64E2240B-1DFE-4939-BB2C-8A40FB81329D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {64E2240B-1DFE-4939-BB2C-8A40FB81329D}.Debug|Any CPU.Build.0 = Debug|Any CPU {64E2240B-1DFE-4939-BB2C-8A40FB81329D}.Release|Any CPU.ActiveCfg = Release|Any CPU diff --git a/src/AXOpen.sln b/src/AXOpen.sln index 0736f2022..f184393b0 100644 --- a/src/AXOpen.sln +++ b/src/AXOpen.sln @@ -1,5 +1,5 @@ Microsoft Visual Studio Solution File, Format Version 12.00 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen", "AXOpen.proj", "{51D303B0-6291-4BAB-939B-8C378F619298}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AXOpen", "AXOpen.proj", "{51D303B0-6291-4BAB-939B-8C378F619298}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "librarytemplate.blazor", "abstractions\app\ix-blazor\librarytemplate.blazor\librarytemplate.blazor.csproj", "{CDA29D58-7DD5-46C8-946C-CD4B04F5EB49}" EndProject @@ -835,8 +835,7 @@ Global GlobalSection(ProjectConfigurationPlatforms) = postSolution {51D303B0-6291-4BAB-939B-8C378F619298}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {51D303B0-6291-4BAB-939B-8C378F619298}.Debug|Any CPU.Build.0 = Debug|Any CPU - {51D303B0-6291-4BAB-939B-8C378F619298}.Release|Any CPU.ActiveCfg = Release|Any CPU - {51D303B0-6291-4BAB-939B-8C378F619298}.Release|Any CPU.Build.0 = Release|Any CPU + {51D303B0-6291-4BAB-939B-8C378F619298}.Release|Any CPU.ActiveCfg = Debug|Any CPU {CDA29D58-7DD5-46C8-946C-CD4B04F5EB49}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {CDA29D58-7DD5-46C8-946C-CD4B04F5EB49}.Debug|Any CPU.Build.0 = Debug|Any CPU {CDA29D58-7DD5-46C8-946C-CD4B04F5EB49}.Release|Any CPU.ActiveCfg = Release|Any CPU diff --git a/src/NuGet.config b/src/NuGet.config index 33a58804b..462922ec9 100644 --- a/src/NuGet.config +++ b/src/NuGet.config @@ -1,10 +1,19 @@ - + + + - + + + + + + + + diff --git a/src/components.abb.robotics/src/AXOpen.Components.Abb.Robotics/ix_ax_axopen_components_abb_robotics.csproj b/src/components.abb.robotics/src/AXOpen.Components.Abb.Robotics/ix_ax_axopen_components_abb_robotics.csproj index 07b776740..afca9d765 100644 --- a/src/components.abb.robotics/src/AXOpen.Components.Abb.Robotics/ix_ax_axopen_components_abb_robotics.csproj +++ b/src/components.abb.robotics/src/AXOpen.Components.Abb.Robotics/ix_ax_axopen_components_abb_robotics.csproj @@ -43,10 +43,10 @@ - + diff --git a/src/components.balluff.identification/src/AXOpen.Components.Balluff.Identification/ix_ax_axopen_components_balluff_identification.csproj b/src/components.balluff.identification/src/AXOpen.Components.Balluff.Identification/ix_ax_axopen_components_balluff_identification.csproj index c2a41ac54..35736175f 100644 --- a/src/components.balluff.identification/src/AXOpen.Components.Balluff.Identification/ix_ax_axopen_components_balluff_identification.csproj +++ b/src/components.balluff.identification/src/AXOpen.Components.Balluff.Identification/ix_ax_axopen_components_balluff_identification.csproj @@ -42,10 +42,10 @@ - + diff --git a/src/components.cognex.vision/src/AXOpen.Components.Cognex.Vision/ix_ax_axopen_components_cognex_vision.csproj b/src/components.cognex.vision/src/AXOpen.Components.Cognex.Vision/ix_ax_axopen_components_cognex_vision.csproj index 5676468a5..9dbf04510 100644 --- a/src/components.cognex.vision/src/AXOpen.Components.Cognex.Vision/ix_ax_axopen_components_cognex_vision.csproj +++ b/src/components.cognex.vision/src/AXOpen.Components.Cognex.Vision/ix_ax_axopen_components_cognex_vision.csproj @@ -43,10 +43,10 @@ - + diff --git a/src/components.desoutter.tightening/src/AXOpen.Components.Desoutter.Tightening/ix_ax_axopen_components_desoutter_tightening.csproj b/src/components.desoutter.tightening/src/AXOpen.Components.Desoutter.Tightening/ix_ax_axopen_components_desoutter_tightening.csproj index 2ced7b3e5..038c128dc 100644 --- a/src/components.desoutter.tightening/src/AXOpen.Components.Desoutter.Tightening/ix_ax_axopen_components_desoutter_tightening.csproj +++ b/src/components.desoutter.tightening/src/AXOpen.Components.Desoutter.Tightening/ix_ax_axopen_components_desoutter_tightening.csproj @@ -42,10 +42,10 @@ - + diff --git a/src/components.drives/src/AXOpen.Components.Drives/ix_ax_axopen_components_drives.csproj b/src/components.drives/src/AXOpen.Components.Drives/ix_ax_axopen_components_drives.csproj index a354899f3..45f83e309 100644 --- a/src/components.drives/src/AXOpen.Components.Drives/ix_ax_axopen_components_drives.csproj +++ b/src/components.drives/src/AXOpen.Components.Drives/ix_ax_axopen_components_drives.csproj @@ -42,10 +42,10 @@ - + diff --git a/src/components.festo.drives/src/AXOpen.Components.Festo.Drives/ix_ax_axopen_components_festo_drives.csproj b/src/components.festo.drives/src/AXOpen.Components.Festo.Drives/ix_ax_axopen_components_festo_drives.csproj index 5d9d2a6c6..60cb6534c 100644 --- a/src/components.festo.drives/src/AXOpen.Components.Festo.Drives/ix_ax_axopen_components_festo_drives.csproj +++ b/src/components.festo.drives/src/AXOpen.Components.Festo.Drives/ix_ax_axopen_components_festo_drives.csproj @@ -42,10 +42,10 @@ - + diff --git a/src/components.kuka.robotics/src/AXOpen.Components.Kuka.Robotics/ix_ax_axopen_components_kuka_robotics.csproj b/src/components.kuka.robotics/src/AXOpen.Components.Kuka.Robotics/ix_ax_axopen_components_kuka_robotics.csproj index 599ae8589..db266acd8 100644 --- a/src/components.kuka.robotics/src/AXOpen.Components.Kuka.Robotics/ix_ax_axopen_components_kuka_robotics.csproj +++ b/src/components.kuka.robotics/src/AXOpen.Components.Kuka.Robotics/ix_ax_axopen_components_kuka_robotics.csproj @@ -42,10 +42,10 @@ - + diff --git a/src/components.mitsubishi.robotics/src/AXOpen.Components.Mitsubishi.Robotics/ix_ax_axopen_components_mitsubishi_robotics.csproj b/src/components.mitsubishi.robotics/src/AXOpen.Components.Mitsubishi.Robotics/ix_ax_axopen_components_mitsubishi_robotics.csproj index b21a67ebc..5a7606645 100644 --- a/src/components.mitsubishi.robotics/src/AXOpen.Components.Mitsubishi.Robotics/ix_ax_axopen_components_mitsubishi_robotics.csproj +++ b/src/components.mitsubishi.robotics/src/AXOpen.Components.Mitsubishi.Robotics/ix_ax_axopen_components_mitsubishi_robotics.csproj @@ -43,10 +43,10 @@ - + diff --git a/src/components.rexroth.drives/src/AXOpen.Components.Rexroth.Drives/ix_ax_axopen_components_rexroth_drives.csproj b/src/components.rexroth.drives/src/AXOpen.Components.Rexroth.Drives/ix_ax_axopen_components_rexroth_drives.csproj index cbf81fe78..980c4056e 100644 --- a/src/components.rexroth.drives/src/AXOpen.Components.Rexroth.Drives/ix_ax_axopen_components_rexroth_drives.csproj +++ b/src/components.rexroth.drives/src/AXOpen.Components.Rexroth.Drives/ix_ax_axopen_components_rexroth_drives.csproj @@ -42,10 +42,10 @@ - + diff --git a/src/components.rexroth.press/src/AXOpen.Components.Rexroth.Press/ix_ax_axopen_components_rexroth_press.csproj b/src/components.rexroth.press/src/AXOpen.Components.Rexroth.Press/ix_ax_axopen_components_rexroth_press.csproj index c78bd5adc..9f85a5a6f 100644 --- a/src/components.rexroth.press/src/AXOpen.Components.Rexroth.Press/ix_ax_axopen_components_rexroth_press.csproj +++ b/src/components.rexroth.press/src/AXOpen.Components.Rexroth.Press/ix_ax_axopen_components_rexroth_press.csproj @@ -43,10 +43,10 @@ - + diff --git a/src/components.robotics/src/AXOpen.Components.Robotics/ix_ax_axopen_components_robotics.csproj b/src/components.robotics/src/AXOpen.Components.Robotics/ix_ax_axopen_components_robotics.csproj index 15e2fc07b..d57066c15 100644 --- a/src/components.robotics/src/AXOpen.Components.Robotics/ix_ax_axopen_components_robotics.csproj +++ b/src/components.robotics/src/AXOpen.Components.Robotics/ix_ax_axopen_components_robotics.csproj @@ -43,10 +43,10 @@ - + diff --git a/src/components.siemens.identification/src/AXOpen.Components.Siemens.Identification/ix_ax_axopen_components_siemens_identification.csproj b/src/components.siemens.identification/src/AXOpen.Components.Siemens.Identification/ix_ax_axopen_components_siemens_identification.csproj index ec29f3d1a..4fef3a3e5 100644 --- a/src/components.siemens.identification/src/AXOpen.Components.Siemens.Identification/ix_ax_axopen_components_siemens_identification.csproj +++ b/src/components.siemens.identification/src/AXOpen.Components.Siemens.Identification/ix_ax_axopen_components_siemens_identification.csproj @@ -42,10 +42,10 @@ - + diff --git a/src/components.ur.robotics/src/AXOpen.Components.Ur.Robotics/ix_ax_axopen_components_ur_robotics.csproj b/src/components.ur.robotics/src/AXOpen.Components.Ur.Robotics/ix_ax_axopen_components_ur_robotics.csproj index f2163c786..b277a1342 100644 --- a/src/components.ur.robotics/src/AXOpen.Components.Ur.Robotics/ix_ax_axopen_components_ur_robotics.csproj +++ b/src/components.ur.robotics/src/AXOpen.Components.Ur.Robotics/ix_ax_axopen_components_ur_robotics.csproj @@ -43,10 +43,10 @@ - + diff --git a/src/inspectors/src/AxOpen.Inspectors/ix_ax_axopen_inspectors.csproj b/src/inspectors/src/AxOpen.Inspectors/ix_ax_axopen_inspectors.csproj index f48289cc2..b72917a3b 100644 --- a/src/inspectors/src/AxOpen.Inspectors/ix_ax_axopen_inspectors.csproj +++ b/src/inspectors/src/AxOpen.Inspectors/ix_ax_axopen_inspectors.csproj @@ -42,10 +42,10 @@ - + diff --git a/src/io/src/AXOpen.Io/ix_ax_axopen_io.csproj b/src/io/src/AXOpen.Io/ix_ax_axopen_io.csproj index a286a569a..7c1638b60 100644 --- a/src/io/src/AXOpen.Io/ix_ax_axopen_io.csproj +++ b/src/io/src/AXOpen.Io/ix_ax_axopen_io.csproj @@ -43,10 +43,10 @@ - + diff --git a/src/template.axolibrary/src/projname/ix_ax_apaxlibname.csproj b/src/template.axolibrary/src/projname/ix_ax_apaxlibname.csproj index a8cb96d77..ea734cc5d 100644 --- a/src/template.axolibrary/src/projname/ix_ax_apaxlibname.csproj +++ b/src/template.axolibrary/src/projname/ix_ax_apaxlibname.csproj @@ -42,10 +42,10 @@ - + diff --git a/src/template.axolibrary/src/projname/ix_ax_axolib.csproj b/src/template.axolibrary/src/projname/ix_ax_axolib.csproj index 6c994997b..6e93dd1fb 100644 --- a/src/template.axolibrary/src/projname/ix_ax_axolib.csproj +++ b/src/template.axolibrary/src/projname/ix_ax_axolib.csproj @@ -42,10 +42,10 @@ - +