Skip to content

[Mirror] Fix Windows desktop OS build version reporting #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bmehta001 wants to merge 8 commits into
base: main
Choose a base branch
from
Open

[Mirror] Fix Windows desktop OS build version reporting #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
5e7bf17
Fix Windows OS build version reporting
bmehta001 May 18, 2026
9ab7dec
Merge branch 'main' into bhamehta/fix-windows-os-version
bmehta001 May 20, 2026
05ce748
Add deterministic Windows OS version source tests
bmehta001 May 20, 2026
ce43060
Cover zero Windows servicing build revision
bmehta001 May 20, 2026
de38c4b
Update vendored zlib to 1.3.2 (#1443)
bmehta001 May 22, 2026
278d785
Merge branch 'main' into bhamehta/fix-windows-os-version
bmehta001 May 22, 2026
0e2d728
Remove stale MSBuild project entries (#1444)
bmehta001 May 22, 2026
969145e
Merge branch 'main' into bhamehta/fix-windows-os-version
bmehta001 May 22, 2026
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
3 changes: 0 additions & 3 deletions Solutions/Clienttelemetry/Clienttelemetry.vcxitems
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,6 @@
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\bond\CompactBinaryProtocolWriter.hpp" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\bond\generated\BondConstTypes.hpp" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\bond\generated\CsProtocol_readers.hpp" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\bond\generated\CsProtocol_types.hpp" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\bond\generated\CsProtocol_writers.hpp" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\compression\HttpDeflateCompression.hpp" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\config\RuntimeConfig_Default.hpp" />
Expand Down Expand Up @@ -116,7 +115,6 @@
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\include\mat\IPropertyChangedCallback.hpp" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\include\mat\ISystemInformation.hpp" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\include\mat\oacr.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\include\mat\TransmitProfiles.hpp" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\include\public\CommonFields.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\include\public\CompliantByDefaultFilterApi.hpp" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\include\public\CsProtocol_types.hpp" />
Expand Down Expand Up @@ -159,7 +157,6 @@
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\include\public\Version.hpp" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\offline\ClockSkewManager.hpp" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\offline\ISqlite3Proxy.hpp" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\offline\IStorage.hpp" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\offline\KillSwitchManager.hpp" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\offline\LogSessionDataProvider.hpp" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\offline\MemoryStorage.hpp" />
Expand Down
5 changes: 0 additions & 5 deletions Solutions/Clienttelemetry/Clienttelemetry.vcxitems.filters
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,6 @@
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\bond\CompactBinaryProtocolWriter.hpp" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\bond\generated\BondConstTypes.hpp" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\bond\generated\CsProtocol_readers.hpp" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\bond\generated\CsProtocol_types.hpp" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\bond\generated\CsProtocol_writers.hpp" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\compression\HttpDeflateCompression.hpp" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\config\RuntimeConfig_Default.hpp" />
Expand Down Expand Up @@ -101,7 +100,6 @@
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\include\mat\IPropertyChangedCallback.hpp" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\include\mat\ISystemInformation.hpp" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\include\mat\oacr.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\include\mat\TransmitProfiles.hpp" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\include\public\CommonFields.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\include\public\CompliantByDefaultFilterApi.hpp" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\include\public\CsProtocol_types.hpp" />
Expand All @@ -124,8 +122,6 @@
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\include\public\IEventFilterCollection.hpp" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\include\public\ILogManager.hpp" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\include\public\IOfflineStorage.hpp" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\include\public\IDataViewer.hpp" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\include\public\IDataViewerCollection.hpp" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\include\public\IHttpClient.hpp" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\include\public\ILogConfiguration.hpp" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\include\public\ILogger.hpp" />
Expand All @@ -146,7 +142,6 @@
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\include\public\Version.hpp" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\offline\ClockSkewManager.hpp" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\offline\ISqlite3Proxy.hpp" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\offline\IStorage.hpp" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\offline\KillSwitchManager.hpp" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\offline\LogSessionDataProvider.hpp" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\offline\MemoryStorage.hpp" />
Expand Down
2 changes: 1 addition & 1 deletion Solutions/MSTelemetrySDK.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtest", "..\tests\googletes
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sqlite-uwp", "..\sqliteUWP\sqlite-uwp.vcxproj", "{6883A688-89F5-424A-9BFA-50D42F691B29}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib", "..\zlib\contrib\vstudio\vc14\zlibvc.vcxproj", "{8FD826F8-3739-44E6-8CC8-997122E53B8D}"
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib", "..\third_party\Solutions\zlib\vc14\zlibvc.vcxproj", "{8FD826F8-3739-44E6-8CC8-997122E53B8D}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "PAL", "PAL", "{34B3E59D-E740-4C23-ACEE-E94C80E83A18}"
EndProject
Expand Down
4 changes: 2 additions & 2 deletions Solutions/net40/net40.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(SolutionDir)\before.targets" Condition="Exists('$(SolutionDir)\before.targets')" />
<ItemGroup Label="ProjectConfigurations">
Expand Down Expand Up @@ -282,7 +282,7 @@
<ProjectReference Include="..\..\sqlite\sqlite.vcxproj">
<Project>{2ebc7b3c-2af1-442c-9285-cab39bbb8c00}</Project>
</ProjectReference>
<ProjectReference Include="..\..\zlib\contrib\vstudio\vc14\zlibvc.vcxproj">
<ProjectReference Include="..\..\third_party\Solutions\zlib\vc14\zlibvc.vcxproj">
<Project>{8fd826f8-3739-44e6-8cc8-997122e53b8d}</Project>
</ProjectReference>
<ProjectReference Include="..\win32-lib\win32-lib.vcxproj">
Expand Down
2 changes: 1 addition & 1 deletion Solutions/win10-cs/win10-cs.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -401,7 +401,7 @@
</ResourceCompile>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\zlib\contrib\vstudio\vc14\zlibvc.vcxproj">
<ProjectReference Include="..\..\third_party\Solutions\zlib\vc14\zlibvc.vcxproj">
<Project>{8FD826F8-3739-44E6-8CC8-997122E53B8D}</Project>
</ProjectReference>
</ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions Solutions/win10-dll/win10-dll.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(SolutionDir)\before.targets" Condition="Exists('$(SolutionDir)\before.targets')" />
<ItemGroup Label="ProjectConfigurations">
Expand Down Expand Up @@ -415,7 +415,7 @@
</ResourceCompile>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\zlib\contrib\vstudio\vc14\zlibvc.vcxproj">
<ProjectReference Include="..\..\third_party\Solutions\zlib\vc14\zlibvc.vcxproj">
<Project>{8FD826F8-3739-44E6-8CC8-997122E53B8D}</Project>
</ProjectReference>
</ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions Solutions/win10-lib/win10-lib.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(SolutionDir)\before.targets" Condition="Exists('$(SolutionDir)\before.targets')" />
<ItemGroup Label="ProjectConfigurations">
Expand Down Expand Up @@ -372,7 +372,7 @@
<ClInclude Include="targetver.h" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\zlib\contrib\vstudio\vc14\zlibvc.vcxproj">
<ProjectReference Include="..\..\third_party\Solutions\zlib\vc14\zlibvc.vcxproj">
<Project>{8fd826f8-3739-44e6-8cc8-997122e53b8d}</Project>
</ProjectReference>
</ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion Solutions/win32-dll/win32-dll.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -327,7 +327,7 @@
</Lib>
</ItemDefinitionGroup>
<ItemGroup>
<ProjectReference Include="..\..\zlib\contrib\vstudio\vc14\zlibvc.vcxproj">
<ProjectReference Include="..\..\third_party\Solutions\zlib\vc14\zlibvc.vcxproj">
<Project>{8fd826f8-3739-44e6-8cc8-997122e53b8d}</Project>
</ProjectReference>
</ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions cgmanifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,10 @@
"Type": "git",
"git": {
"RepositoryUrl": "https://github.com/madler/zlib",
"CommitHash": "cacf7f1d4e3d44d871b605da3b647f07d718623f"
"CommitHash": "da607da739fa6047df13e66a2af6b8bec7c2a498"
}
},
"DevelopmentDependency": false
}
]
}
}
6 changes: 3 additions & 3 deletions examples/cpp/EventSender/EventSender.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,13 +200,13 @@
<ClCompile Include="EventSender.cpp" />
</ItemGroup>
<ItemGroup Condition="$(Configuration.Contains('static'))">
<ProjectReference Include="..\..\Solutions\win32-lib\win32-lib.vcxproj">
<ProjectReference Include="..\..\..\Solutions\win32-lib\win32-lib.vcxproj">
<Project>{1DC6B38A-B390-34CE-907F-4958807A3D42}</Project>
</ProjectReference>
<ProjectReference Include="..\..\sqlite\sqlite.vcxproj">
<ProjectReference Include="..\..\..\sqlite\sqlite.vcxproj">
<Project>{2ebc7b3c-2af1-442c-9285-cab39bbb8c00}</Project>
</ProjectReference>
<ProjectReference Include="..\..\zlib\contrib\vstudio\vc14\zlibvc.vcxproj">
<ProjectReference Include="..\..\..\third_party\Solutions\zlib\vc14\zlibvc.vcxproj">
<Project>{8fd826f8-3739-44e6-8cc8-997122e53b8d}</Project>
</ProjectReference>
</ItemGroup>
Expand Down
95 changes: 0 additions & 95 deletions examples/cpp/EventSender/EventSender.vcxproj.filters
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,99 +19,4 @@
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<None Include="deploy-dll.cmd" />
<None Include="include\Version.hpp.template">
<Filter>Header Files</Filter>
</None>
</ItemGroup>
<ItemGroup>
<ClInclude Include="include\AggregatedMetric.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="include\mat.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="include\CAPIClient.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="include\CorrelationVector.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="include\ctmacros.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="include\DebugEvents.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="include\Enums.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="include\EventProperties.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="include\EventProperty.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="include\IAFDClient.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="include\IAuthTokensController.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="include\IBandwidthController.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="include\IECSClient.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="include\IHttpClient.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="include\ILogConfiguration.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="include\ILogger.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="include\ILogManager.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="include\ISemanticContext.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="include\LogConfiguration.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="include\LogManager.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="include\LogManagerBase.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="include\LogManagerProvider.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="include\LogSessionData.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="include\NullObjects.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="include\TransmitProfiles.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="include\Variant.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="include\VariantType.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="include\Version.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="include\Version.hpp">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
</Project>
6 changes: 3 additions & 3 deletions examples/cpp/SampleCpp/SampleCpp.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1093,13 +1093,13 @@
<None Include="deploy-dll.cmd" />
</ItemGroup>
<ItemGroup Condition="$(Configuration.Contains('static'))">
<ProjectReference Include="..\..\Solutions\win32-lib\win32-lib.vcxproj">
<ProjectReference Include="..\..\..\Solutions\win32-lib\win32-lib.vcxproj">
<Project>{1DC6B38A-B390-34CE-907F-4958807A3D42}</Project>
</ProjectReference>
<ProjectReference Include="..\..\sqlite\sqlite.vcxproj">
<ProjectReference Include="..\..\..\sqlite\sqlite.vcxproj">
<Project>{2ebc7b3c-2af1-442c-9285-cab39bbb8c00}</Project>
</ProjectReference>
<ProjectReference Include="..\..\zlib\contrib\vstudio\vc14\zlibvc.vcxproj">
<ProjectReference Include="..\..\..\third_party\Solutions\zlib\vc14\zlibvc.vcxproj">
<Project>{8fd826f8-3739-44e6-8cc8-997122e53b8d}</Project>
</ProjectReference>
</ItemGroup>
Expand Down
1 change: 0 additions & 1 deletion examples/cpp/SampleCppUWP/SampleCppUWP.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,7 +281,6 @@
</ItemGroup>
<ItemGroup>
<None Include="packages.config" />
<None Include="TestApp.pfx" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\Solutions\win10-dll\win10-dll.vcxproj">
Expand Down
1 change: 0 additions & 1 deletion examples/cpp/SampleCppUWP/SampleCppUWP.vcxproj.filters
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,5 @@
</ItemGroup>
<ItemGroup>
<None Include="packages.config" />
<None Include="TestApp.pfx" />
</ItemGroup>
</Project>
Loading
Loading