Skip to content

Make the Master Build restore pass: regenerate the Release vendor unsupported lock files #834

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

Merged
htsugawa merged 5 commits into from
Oct 16, 2026
Merged

Make the Master Build restore pass: regenerate the Release vendor unsupported lock files #834

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3b323a5
Regenerate the Release vendor unsupported lock files against the sour…
Oct 15, 2026
bacc570
Restore the console publish legs of Master Build without locked mode
Oct 15, 2026
3d36a75
Check the Release vendor unsupported lock files in PR Check
Oct 15, 2026
297dad2
Allow the duplicate SQLite.Interop.dll in the MSDIAL5 publish job
Oct 15, 2026
ea85a44
Merge master into fix/master-build-lock-files for #833's test fixes
Oct 16, 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
18 changes: 13 additions & 5 deletions .github/workflows/dotnet_master.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,11 @@ jobs:
run: dotnet nuget add source ${{ github.workspace }}/Assemblies
- name: Restore packages
run: dotnet restore /property:Configuration="Release vendor unsupported"
# MsdialGuiApp restores for win-x64, so System.Data.SQLite.Core contributes its
# runtimes/win-x64/native/netstandard2.0 and netstandard2.1 SQLite.Interop.dll, two
# identical files with one publish path (NETSDK1152).
- name: Publish
run: dotnet publish src/MSDIAL5/MsdialGuiApp/MsdialGuiApp.csproj -p:PublishProfile=FolderProfile -p:DownloadLibrary=false -o artifact --configuration "Release vendor unsupported" --framework net48
run: dotnet publish src/MSDIAL5/MsdialGuiApp/MsdialGuiApp.csproj -p:PublishProfile=FolderProfile -p:DownloadLibrary=false -p:ErrorOnDuplicatePublishOutputFiles=false -o artifact --configuration "Release vendor unsupported" --framework net48
- name: Copy licenses
run: Copy-Item -Path LGPL.txt,THIRD-PARTY-LICENSE-README.md,README.md -Destination artifact
- name: Upload
Expand Down Expand Up @@ -84,10 +87,14 @@ jobs:
${{ runner.os }}-nuget-
- name: Add package source
run: dotnet nuget add source ${{ github.workspace }}/Assemblies
# The console legs restore without locked mode: --runtime makes every project in the
# chain restore for a runtime identifier its lock file does not list (NU1004), and on
# Linux and macOS the SDK adds reference-assembly packages to the .NET Framework
# targets. The test job keeps the locked restore that checks the lock files.
- name: Restore packages
run: dotnet restore src/MSDIAL4/MsdialConsoleAppCore/MsdialConsoleAppCore.csproj /property:Configuration="Release vendor unsupported"
run: dotnet restore src/MSDIAL4/MsdialConsoleAppCore/MsdialConsoleAppCore.csproj /property:Configuration="Release vendor unsupported" /property:RestoreLockedMode=false
- name: Publish
run: dotnet publish tests/MSDIAL5/MsdialCoreTestApp/MsdialCoreTestApp.csproj -p:DebugSymbols=false -p:DebugType=None -p:ErrorOnDuplicatePublishOutputFiles=false -p:DownloadLibrary=false -o artifact --configuration "Release vendor unsupported" --runtime ${{ matrix.triple.runtime }} --framework ${{ matrix.triple.framework }} --self-contained
run: dotnet publish tests/MSDIAL5/MsdialCoreTestApp/MsdialCoreTestApp.csproj -p:DebugSymbols=false -p:DebugType=None -p:ErrorOnDuplicatePublishOutputFiles=false -p:DownloadLibrary=false -p:RestoreLockedMode=false -o artifact --configuration "Release vendor unsupported" --runtime ${{ matrix.triple.runtime }} --framework ${{ matrix.triple.framework }} --self-contained
- name: Copy licenses
run: |
cp LGPL.txt artifact
Expand Down Expand Up @@ -148,10 +155,11 @@ jobs:
${{ runner.os }}-nuget-
- name: Add package source
run: dotnet nuget add source ${{ github.workspace }}/Assemblies
# Unlocked restore for the same reasons as publish-msdial5-console.
- name: Restore packages
run: dotnet restore src/MSDIAL4/MsdialConsoleAppCore/MsdialConsoleAppCore.csproj /property:Configuration="Release vendor unsupported"
run: dotnet restore src/MSDIAL4/MsdialConsoleAppCore/MsdialConsoleAppCore.csproj /property:Configuration="Release vendor unsupported" /property:RestoreLockedMode=false
- name: Publish
run: dotnet publish src/MSDIAL4/MsdialConsoleAppCore/MsdialConsoleAppCore.csproj -o artifact --configuration "Release vendor unsupported" --framework net8 --self-contained --runtime ${{ matrix.pair.runtime }} -p:DownloadLibrary=false
run: dotnet publish src/MSDIAL4/MsdialConsoleAppCore/MsdialConsoleAppCore.csproj -o artifact --configuration "Release vendor unsupported" --framework net8 --self-contained --runtime ${{ matrix.pair.runtime }} -p:DownloadLibrary=false -p:RestoreLockedMode=false
- name: Copy licenses
run: |
cp LGPL.txt artifact
Expand Down
6 changes: 6 additions & 0 deletions .github/workflows/dotnet_pr.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,12 @@ jobs:
${{ runner.os }}-nuget-
- name: Add package source
run: dotnet nuget add source ${{ github.workspace }}/Assemblies
# Master Build restores "Release vendor unsupported" in locked mode against the
# packages.lock.ReleaseVendorUnsupported.json files. Doing the same here makes a stale
# lock file fail the pull request rather than master. It runs before the Debug restore
# so that the build below still uses that restore's output.
- name: Check lock files
run: dotnet restore /property:Configuration="Release vendor unsupported"
- name: Restore packages
run: dotnet restore /property:Configuration="Debug vendor unsupported"
- name: Build
Expand Down
44 changes: 40 additions & 4 deletions src/MSDIAL4/ChromatogramUI/packages.lock.ReleaseVendorUnsupported.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,10 @@
"RawDataHandler-Vendor-UnSupported": {
"type": "Direct",
"requested": "[1.0.*, )",
"resolved": "1.0.8739.525",
"contentHash": "x1exfWDljPq9GzhEmLOuT3OifiY9dXXZG4+w1nRlaYbf9QlJne4mgKFm2OeWo5bN+AqXTAD7wAuYEteIttUHjg==",
"resolved": "1.3.9699.471",
"contentHash": "eiLk9/i9oKF2G26JvSuae+KJckx2HiVk2iJ5TMmrrv7WTafTA+OSxodKXOZu0nyk/B/BGy7TsAGpUNWsnSjzIg==",
"dependencies": {
"System.Buffers": "4.5.1",
"zlib.net": "1.0.3"
}
},
Expand Down Expand Up @@ -225,9 +226,12 @@
"RawDataHandler-Vendor-UnSupported": {
"type": "Direct",
"requested": "[1.0.*, )",
"resolved": "1.0.8739.525",
"contentHash": "x1exfWDljPq9GzhEmLOuT3OifiY9dXXZG4+w1nRlaYbf9QlJne4mgKFm2OeWo5bN+AqXTAD7wAuYEteIttUHjg==",
"resolved": "1.3.9699.471",
"contentHash": "eiLk9/i9oKF2G26JvSuae+KJckx2HiVk2iJ5TMmrrv7WTafTA+OSxodKXOZu0nyk/B/BGy7TsAGpUNWsnSjzIg==",
"dependencies": {
"System.Buffers": "4.5.1",
"System.Memory": "4.5.5",
"ZstdSharp.Port": "0.8.1",
"zlib.net": "1.0.3"
}
},
Expand Down Expand Up @@ -280,6 +284,14 @@
"resolved": "1.6.0",
"contentHash": "gWH/And7eJFxDT/q/hWFyWjrCni6HJ01fgDB2NUhYaqrEZN2LtsaTwAkSPhd26AdAbeYkZg7kS/umlt2Wci2HQ=="
},
"Microsoft.Bcl.AsyncInterfaces": {
"type": "Transitive",
"resolved": "5.0.0",
"contentHash": "W8DPQjkMScOMTtJbPwmPyj9c3zYSFGawDW3jwlBOOsnY+EzZFLgNQ/UMkK35JmkNOVPdCyPr2Tw7Vv9N+KA3ZQ==",
"dependencies": {
"System.Threading.Tasks.Extensions": "4.5.4"
}
},
"Microsoft.Xaml.Behaviors.Wpf": {
"type": "Transitive",
"resolved": "1.1.39",
Expand All @@ -305,6 +317,16 @@
"resolved": "4.3.0",
"contentHash": "3qjaHvxQPDpSOYICjUoTsmoq5u6QJAFRUITgeT/4gqkF1bajbSmb1kwSxEA8AHlofqgcKJcM8udgieRNhaJ5Cg=="
},
"System.Memory": {
"type": "Transitive",
"resolved": "4.5.5",
"contentHash": "XIWiDvKPXaTveaB7HVganDlOCRoj03l+jrwNvcge/t8vhGYKvqV+dMv6G4SAX2NoNmN0wZfVPTAlFwZcZvVOUw==",
"dependencies": {
"System.Buffers": "4.5.1",
"System.Numerics.Vectors": "4.5.0",
"System.Runtime.CompilerServices.Unsafe": "4.5.3"
}
},
"System.Net.Http": {
"type": "Transitive",
"resolved": "4.3.4",
Expand All @@ -313,6 +335,11 @@
"System.Security.Cryptography.X509Certificates": "4.3.0"
}
},
"System.Numerics.Vectors": {
"type": "Transitive",
"resolved": "4.5.0",
"contentHash": "QQTlPTl06J/iiDbJCiepZ4H//BVraReU4O4EoRw1U02H5TLUIT7xn3GnDp9AXPSlJUDyFs4uWjWafNX6WrAojQ=="
},
"System.Reflection.Emit": {
"type": "Transitive",
"resolved": "4.7.0",
Expand Down Expand Up @@ -386,6 +413,15 @@
"resolved": "1.0.3",
"contentHash": "LvG2IMi1sSsVK+AE/f2yiYh17tEIYWL3dNLuXXUJycAeAr8lrzm5Iuna34kP+NaZXFBBn6etHc2rgH1xQCc6YQ=="
},
"ZstdSharp.Port": {
"type": "Transitive",
"resolved": "0.8.1",
"contentHash": "19tNz33kn2EkyViFXuxfVn338UJaRmkwBphVqP2dVJIYQUQgFrgG5h061mxkRRg1Ax6r+6WOj1FxaFZ5qaWqqg==",
"dependencies": {
"Microsoft.Bcl.AsyncInterfaces": "5.0.0",
"System.Memory": "4.5.5"
}
},
"chartdrawing": {
"type": "Project",
"dependencies": {
Expand Down
83 changes: 77 additions & 6 deletions src/MSDIAL4/MsDial/packages.lock.ReleaseVendorUnsupported.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,9 +134,10 @@
},
"RawDataHandler-Vendor-UnSupported": {
"type": "Transitive",
"resolved": "1.0.8739.525",
"contentHash": "x1exfWDljPq9GzhEmLOuT3OifiY9dXXZG4+w1nRlaYbf9QlJne4mgKFm2OeWo5bN+AqXTAD7wAuYEteIttUHjg==",
"resolved": "1.3.9699.471",
"contentHash": "eiLk9/i9oKF2G26JvSuae+KJckx2HiVk2iJ5TMmrrv7WTafTA+OSxodKXOZu0nyk/B/BGy7TsAGpUNWsnSjzIg==",
"dependencies": {
"System.Buffers": "4.5.1",
"zlib.net": "1.0.3"
}
},
Expand Down Expand Up @@ -636,6 +637,14 @@
"Microsoft.Bcl.Build": "1.0.14"
}
},
"Microsoft.Bcl.AsyncInterfaces": {
"type": "Transitive",
"resolved": "5.0.0",
"contentHash": "W8DPQjkMScOMTtJbPwmPyj9c3zYSFGawDW3jwlBOOsnY+EzZFLgNQ/UMkK35JmkNOVPdCyPr2Tw7Vv9N+KA3ZQ==",
"dependencies": {
"System.Threading.Tasks.Extensions": "4.5.4"
}
},
"Microsoft.Bcl.Build": {
"type": "Transitive",
"resolved": "1.0.14",
Expand Down Expand Up @@ -679,9 +688,12 @@
},
"RawDataHandler-Vendor-UnSupported": {
"type": "Transitive",
"resolved": "1.0.8739.525",
"contentHash": "x1exfWDljPq9GzhEmLOuT3OifiY9dXXZG4+w1nRlaYbf9QlJne4mgKFm2OeWo5bN+AqXTAD7wAuYEteIttUHjg==",
"resolved": "1.3.9699.471",
"contentHash": "eiLk9/i9oKF2G26JvSuae+KJckx2HiVk2iJ5TMmrrv7WTafTA+OSxodKXOZu0nyk/B/BGy7TsAGpUNWsnSjzIg==",
"dependencies": {
"System.Buffers": "4.5.1",
"System.Memory": "4.5.5",
"ZstdSharp.Port": "0.8.1",
"zlib.net": "1.0.3"
}
},
Expand All @@ -708,6 +720,16 @@
"resolved": "4.3.0",
"contentHash": "3qjaHvxQPDpSOYICjUoTsmoq5u6QJAFRUITgeT/4gqkF1bajbSmb1kwSxEA8AHlofqgcKJcM8udgieRNhaJ5Cg=="
},
"System.Memory": {
"type": "Transitive",
"resolved": "4.5.5",
"contentHash": "XIWiDvKPXaTveaB7HVganDlOCRoj03l+jrwNvcge/t8vhGYKvqV+dMv6G4SAX2NoNmN0wZfVPTAlFwZcZvVOUw==",
"dependencies": {
"System.Buffers": "4.5.1",
"System.Numerics.Vectors": "4.5.0",
"System.Runtime.CompilerServices.Unsafe": "4.5.3"
}
},
"System.Net.Http": {
"type": "Transitive",
"resolved": "4.3.4",
Expand All @@ -716,6 +738,11 @@
"System.Security.Cryptography.X509Certificates": "4.3.0"
}
},
"System.Numerics.Vectors": {
"type": "Transitive",
"resolved": "4.5.0",
"contentHash": "QQTlPTl06J/iiDbJCiepZ4H//BVraReU4O4EoRw1U02H5TLUIT7xn3GnDp9AXPSlJUDyFs4uWjWafNX6WrAojQ=="
},
"System.Reflection.Emit": {
"type": "Transitive",
"resolved": "4.7.0",
Expand Down Expand Up @@ -826,6 +853,15 @@
"resolved": "1.0.3",
"contentHash": "LvG2IMi1sSsVK+AE/f2yiYh17tEIYWL3dNLuXXUJycAeAr8lrzm5Iuna34kP+NaZXFBBn6etHc2rgH1xQCc6YQ=="
},
"ZstdSharp.Port": {
"type": "Transitive",
"resolved": "0.8.1",
"contentHash": "19tNz33kn2EkyViFXuxfVn338UJaRmkwBphVqP2dVJIYQUQgFrgG5h061mxkRRg1Ax6r+6WOj1FxaFZ5qaWqqg==",
"dependencies": {
"Microsoft.Bcl.AsyncInterfaces": "5.0.0",
"System.Memory": "4.5.5"
}
},
"barchart": {
"type": "Project",
"dependencies": {
Expand Down Expand Up @@ -1181,6 +1217,14 @@
"Microsoft.Bcl.Build": "1.0.14"
}
},
"Microsoft.Bcl.AsyncInterfaces": {
"type": "Transitive",
"resolved": "5.0.0",
"contentHash": "W8DPQjkMScOMTtJbPwmPyj9c3zYSFGawDW3jwlBOOsnY+EzZFLgNQ/UMkK35JmkNOVPdCyPr2Tw7Vv9N+KA3ZQ==",
"dependencies": {
"System.Threading.Tasks.Extensions": "4.5.4"
}
},
"Microsoft.Bcl.Build": {
"type": "Transitive",
"resolved": "1.0.14",
Expand Down Expand Up @@ -1224,9 +1268,12 @@
},
"RawDataHandler-Vendor-UnSupported": {
"type": "Transitive",
"resolved": "1.0.8739.525",
"contentHash": "x1exfWDljPq9GzhEmLOuT3OifiY9dXXZG4+w1nRlaYbf9QlJne4mgKFm2OeWo5bN+AqXTAD7wAuYEteIttUHjg==",
"resolved": "1.3.9699.471",
"contentHash": "eiLk9/i9oKF2G26JvSuae+KJckx2HiVk2iJ5TMmrrv7WTafTA+OSxodKXOZu0nyk/B/BGy7TsAGpUNWsnSjzIg==",
"dependencies": {
"System.Buffers": "4.5.1",
"System.Memory": "4.5.5",
"ZstdSharp.Port": "0.8.1",
"zlib.net": "1.0.3"
}
},
Expand All @@ -1253,6 +1300,16 @@
"resolved": "4.3.0",
"contentHash": "3qjaHvxQPDpSOYICjUoTsmoq5u6QJAFRUITgeT/4gqkF1bajbSmb1kwSxEA8AHlofqgcKJcM8udgieRNhaJ5Cg=="
},
"System.Memory": {
"type": "Transitive",
"resolved": "4.5.5",
"contentHash": "XIWiDvKPXaTveaB7HVganDlOCRoj03l+jrwNvcge/t8vhGYKvqV+dMv6G4SAX2NoNmN0wZfVPTAlFwZcZvVOUw==",
"dependencies": {
"System.Buffers": "4.5.1",
"System.Numerics.Vectors": "4.5.0",
"System.Runtime.CompilerServices.Unsafe": "4.5.3"
}
},
"System.Net.Http": {
"type": "Transitive",
"resolved": "4.3.4",
Expand All @@ -1261,6 +1318,11 @@
"System.Security.Cryptography.X509Certificates": "4.3.0"
}
},
"System.Numerics.Vectors": {
"type": "Transitive",
"resolved": "4.5.0",
"contentHash": "QQTlPTl06J/iiDbJCiepZ4H//BVraReU4O4EoRw1U02H5TLUIT7xn3GnDp9AXPSlJUDyFs4uWjWafNX6WrAojQ=="
},
"System.Reflection.Emit": {
"type": "Transitive",
"resolved": "4.7.0",
Expand Down Expand Up @@ -1371,6 +1433,15 @@
"resolved": "1.0.3",
"contentHash": "LvG2IMi1sSsVK+AE/f2yiYh17tEIYWL3dNLuXXUJycAeAr8lrzm5Iuna34kP+NaZXFBBn6etHc2rgH1xQCc6YQ=="
},
"ZstdSharp.Port": {
"type": "Transitive",
"resolved": "0.8.1",
"contentHash": "19tNz33kn2EkyViFXuxfVn338UJaRmkwBphVqP2dVJIYQUQgFrgG5h061mxkRRg1Ax6r+6WOj1FxaFZ5qaWqqg==",
"dependencies": {
"Microsoft.Bcl.AsyncInterfaces": "5.0.0",
"System.Memory": "4.5.5"
}
},
"barchart": {
"type": "Project",
"dependencies": {
Expand Down
5 changes: 3 additions & 2 deletions src/MSDIAL4/MsdialCommonStandard/packages.lock.ReleaseVendorUnsupported.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,9 +72,10 @@
},
"RawDataHandler-Vendor-UnSupported": {
"type": "Transitive",
"resolved": "1.0.8739.525",
"contentHash": "x1exfWDljPq9GzhEmLOuT3OifiY9dXXZG4+w1nRlaYbf9QlJne4mgKFm2OeWo5bN+AqXTAD7wAuYEteIttUHjg==",
"resolved": "1.3.9699.471",
"contentHash": "eiLk9/i9oKF2G26JvSuae+KJckx2HiVk2iJ5TMmrrv7WTafTA+OSxodKXOZu0nyk/B/BGy7TsAGpUNWsnSjzIg==",
"dependencies": {
"System.Buffers": "4.5.1",
"zlib.net": "1.0.3"
}
},
Expand Down
15 changes: 9 additions & 6 deletions src/MSDIAL4/MsdialConsoleAppCore/packages.lock.ReleaseVendorUnsupported.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,9 +63,10 @@
},
"RawDataHandler-Vendor-UnSupported": {
"type": "Transitive",
"resolved": "1.0.8739.525",
"contentHash": "x1exfWDljPq9GzhEmLOuT3OifiY9dXXZG4+w1nRlaYbf9QlJne4mgKFm2OeWo5bN+AqXTAD7wAuYEteIttUHjg==",
"resolved": "1.3.9699.471",
"contentHash": "eiLk9/i9oKF2G26JvSuae+KJckx2HiVk2iJ5TMmrrv7WTafTA+OSxodKXOZu0nyk/B/BGy7TsAGpUNWsnSjzIg==",
"dependencies": {
"System.Buffers": "4.5.1",
"zlib.net": "1.0.3"
}
},
Expand Down Expand Up @@ -1429,9 +1430,10 @@
},
"RawDataHandler-Vendor-UnSupported": {
"type": "Transitive",
"resolved": "1.0.8739.525",
"contentHash": "x1exfWDljPq9GzhEmLOuT3OifiY9dXXZG4+w1nRlaYbf9QlJne4mgKFm2OeWo5bN+AqXTAD7wAuYEteIttUHjg==",
"resolved": "1.3.9699.471",
"contentHash": "eiLk9/i9oKF2G26JvSuae+KJckx2HiVk2iJ5TMmrrv7WTafTA+OSxodKXOZu0nyk/B/BGy7TsAGpUNWsnSjzIg==",
"dependencies": {
"System.Buffers": "4.5.1",
"zlib.net": "1.0.3"
}
},
Expand Down Expand Up @@ -1730,9 +1732,10 @@
},
"RawDataHandler-Vendor-UnSupported": {
"type": "Transitive",
"resolved": "1.0.8739.525",
"contentHash": "x1exfWDljPq9GzhEmLOuT3OifiY9dXXZG4+w1nRlaYbf9QlJne4mgKFm2OeWo5bN+AqXTAD7wAuYEteIttUHjg==",
"resolved": "1.3.9699.471",
"contentHash": "eiLk9/i9oKF2G26JvSuae+KJckx2HiVk2iJ5TMmrrv7WTafTA+OSxodKXOZu0nyk/B/BGy7TsAGpUNWsnSjzIg==",
"dependencies": {
"System.Buffers": "4.5.1",
"zlib.net": "1.0.3"
}
},
Expand Down
Loading
Loading