Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,7 @@ if (Test-IsArm64) {
$tools.AddToolVersion("R", $(Get-RVersion))
}
if (Test-IsX64) {
$tools.AddToolVersion("Service Fabric Runtime", $(Get-ServiceFabricRuntimeVersion))
$tools.AddToolVersion("Service Fabric SDK", $(Get-ServiceFabricSDKVersion))
}
Comment on lines 116 to 119

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It will be updated during build if I understand correctly

$tools.AddToolVersion("Stack", $(Get-StackVersion))
Expand Down
7 changes: 6 additions & 1 deletion images/windows/scripts/docs-gen/SoftwareReport.Tools.psm1
Original file line number Diff line number Diff line change
Expand Up @@ -252,8 +252,13 @@ function Get-StackVersion {
return $stackVersion
}

function Get-ServiceFabricRuntimeVersion {
$serviceFabricRuntimeVersion = Get-ItemPropertyValue 'HKLM:\SOFTWARE\Microsoft\Service Fabric\' -Name FabricVersion
return $serviceFabricRuntimeVersion
}

function Get-ServiceFabricSDKVersion {
$serviceFabricSDKVersion = Get-ItemPropertyValue 'HKLM:\SOFTWARE\Microsoft\Service Fabric\' -Name FabricVersion
$serviceFabricSDKVersion = Get-ItemPropertyValue 'HKLM:\SOFTWARE\Microsoft\Service Fabric SDK\' -Name FabricSDKVersion
return $serviceFabricSDKVersion
}

Expand Down
7 changes: 6 additions & 1 deletion images/windows/scripts/tests/Tools.Tests.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -129,8 +129,13 @@ Describe "ServiceFabricSDK" -Skip:(Test-IsWin11-Arm64) {
}
}

It "Service Fabric runtime version" {
$runtimeVersion = (Get-ToolsetContent).serviceFabric.runtime.version
Get-ItemPropertyValue 'HKLM:\SOFTWARE\Microsoft\Service Fabric\' -Name FabricVersion | Should -Be $runtimeVersion
}

It "ServiceFabricSDK version" {
Get-ItemPropertyValue 'HKLM:\SOFTWARE\Microsoft\Service Fabric\' -Name FabricVersion | Should -Not -BeNullOrEmpty
Get-ItemPropertyValue 'HKLM:\SOFTWARE\Microsoft\Service Fabric SDK\' -Name FabricSDKVersion | Should -Not -BeNullOrEmpty
}
}

Expand Down
8 changes: 4 additions & 4 deletions images/windows/toolsets/toolset-2022.json
Original file line number Diff line number Diff line change
Expand Up @@ -273,12 +273,12 @@
},
"serviceFabric": {
"runtime": {
"version": "10.1.2493.9590",
"checksum": "09C63A971BACDE338282C73B3C9174BED9AAD53E1D3A1B73D44515852C9C00CF"
"version": "11.7.157.1",
"checksum": "BBD4531D80ED5FA8D2704C9267F701684FC58306987184BE9CAF35153F358C7B"
},
"sdk": {
"version": "7.1.2493",
"checksum": "0CB1084156C75CF5075EA91ABA330CF10B58648B8E036C9C2F286805263C497F"
"version": "8.7.157",
"checksum": "32ECB92CA3C9369A0BEA688737F9714E93EC1F8022D1708ABF5084E5B1F9EFBA"
}
},
"dotnet": {
Expand Down
11 changes: 6 additions & 5 deletions images/windows/toolsets/toolset-2025-vs2026.json
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,8 @@
"VisualStudioClient.MicrosoftVisualStudio2022InstallerProjects",
"WixToolset.WixToolsetVisualStudio2022Extension",
"ProBITools.MicrosoftReportProjectsforVisualStudio2022",
"ProBITools.MicrosoftAnalysisServicesModelingProjects2022"
"ProBITools.MicrosoftAnalysisServicesModelingProjects2022",
"ms-azuretools.MicrosoftVisualStudioAzureFabricVsix"
]
},
"docker": {
Expand Down Expand Up @@ -231,12 +232,12 @@
},
"serviceFabric": {
"runtime": {
"version": "10.1.2493.9590",
"checksum": "09C63A971BACDE338282C73B3C9174BED9AAD53E1D3A1B73D44515852C9C00CF"
"version": "11.7.157.1",
"checksum": "BBD4531D80ED5FA8D2704C9267F701684FC58306987184BE9CAF35153F358C7B"
},
"sdk": {
"version": "7.1.2493",
"checksum": "0CB1084156C75CF5075EA91ABA330CF10B58648B8E036C9C2F286805263C497F"
"version": "8.7.157",
"checksum": "32ECB92CA3C9369A0BEA688737F9714E93EC1F8022D1708ABF5084E5B1F9EFBA"
}
},
"dotnet": {
Expand Down
8 changes: 4 additions & 4 deletions images/windows/toolsets/toolset-2025.json
Original file line number Diff line number Diff line change
Expand Up @@ -244,12 +244,12 @@
},
"serviceFabric": {
"runtime": {
"version": "10.1.2493.9590",
"checksum": "09C63A971BACDE338282C73B3C9174BED9AAD53E1D3A1B73D44515852C9C00CF"
"version": "11.7.157.1",
"checksum": "BBD4531D80ED5FA8D2704C9267F701684FC58306987184BE9CAF35153F358C7B"
},
"sdk": {
"version": "7.1.2493",
"checksum": "0CB1084156C75CF5075EA91ABA330CF10B58648B8E036C9C2F286805263C497F"
"version": "8.7.157",
"checksum": "32ECB92CA3C9369A0BEA688737F9714E93EC1F8022D1708ABF5084E5B1F9EFBA"
}
},
"dotnet": {
Expand Down
8 changes: 4 additions & 4 deletions images/windows/toolsets/toolset-win-11-arm64.json
Original file line number Diff line number Diff line change
Expand Up @@ -211,12 +211,12 @@
},
"serviceFabric": {
"runtime": {
"version": "10.1.2493.9590",
"checksum": "09C63A971BACDE338282C73B3C9174BED9AAD53E1D3A1B73D44515852C9C00CF"
"version": "11.7.157.1",
"checksum": "BBD4531D80ED5FA8D2704C9267F701684FC58306987184BE9CAF35153F358C7B"
},
"sdk": {
"version": "7.1.2493",
"checksum": "0CB1084156C75CF5075EA91ABA330CF10B58648B8E036C9C2F286805263C497F"
"version": "8.7.157",
"checksum": "32ECB92CA3C9369A0BEA688737F9714E93EC1F8022D1708ABF5084E5B1F9EFBA"
}
},
"dotnet": {
Expand Down
8 changes: 4 additions & 4 deletions images/windows/toolsets/toolset-win-11-vs2026-arm64.json
Original file line number Diff line number Diff line change
Expand Up @@ -202,12 +202,12 @@
},
"serviceFabric": {
"runtime": {
"version": "10.1.2493.9590",
"checksum": "09C63A971BACDE338282C73B3C9174BED9AAD53E1D3A1B73D44515852C9C00CF"
"version": "11.7.157.1",
"checksum": "BBD4531D80ED5FA8D2704C9267F701684FC58306987184BE9CAF35153F358C7B"
},
"sdk": {
"version": "7.1.2493",
"checksum": "0CB1084156C75CF5075EA91ABA330CF10B58648B8E036C9C2F286805263C497F"
"version": "8.7.157",
"checksum": "32ECB92CA3C9369A0BEA688737F9714E93EC1F8022D1708ABF5084E5B1F9EFBA"
}
},
"dotnet": {
Expand Down
Loading