Skip to content
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

[automated] Merge branch 'release/8.0.1xx' => 'release/8.0.3xx' #20213

Merged
merged 48 commits into from
Nov 5, 2024
Merged

[automated] Merge branch 'release/8.0.1xx' => 'release/8.0.3xx' #20213

Changes from all commits
Commits
Show all changes
48 commits
Select commit Hold shift + click to select a range
217d9c2
Merge commit 'f60e2f2b3a63a2389c6b687e2ca041e61861d0f5'
Aug 7, 2024
ea6e05f
Merge commit 'b4ccb48de25560c0935ae34b69e718501e38fd8e'
Aug 13, 2024
28d7587
Merge commit '457dea4ead3f27c479d9e7afdf44908ecd260f49'
Aug 13, 2024
72536f3
Merge commit '4a3044e356fc360f036185dab549a5f2cd85c4cd'
Aug 14, 2024
24b3f32
Merged PR 41519: [internal/release/6.0.1xx] Update dependencies from …
Aug 16, 2024
cac85ca
Merged PR 41861: Update MsftToSbSdk.diff
ellahathaway Aug 19, 2024
78a9d66
Merged PR 41824: [internal/release/6.0.1xx] Update dependencies from …
Aug 20, 2024
6fc5675
Merge commit 'e78a5c44adc4b14734894244c43591b29ac48d16'
Sep 3, 2024
20d2d3f
Merge commit '4aac028331fd0c700ded224b1b34903d851fec55'
Sep 9, 2024
284ef40
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Sep 10, 2024
9431073
Merged PR 42713: [internal/release/6.0.1xx] Update dependencies from …
Sep 11, 2024
e007159
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Sep 11, 2024
237ac6c
Merged PR 42748: [internal/release/6.0.1xx] Update dependencies from …
Sep 12, 2024
2577b17
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Sep 12, 2024
ab98885
[release/6.0.1xx] Update dependencies from dotnet/arcade (#20128)
dotnet-maestro[bot] Sep 13, 2024
54f04ab
Merged PR 42790: [internal/release/6.0.1xx] Update dependencies from …
Sep 13, 2024
d5fe7a4
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Sep 13, 2024
a2a6e0c
Merged PR 42834: Update MsftToSbSdk.diff
ellahathaway Sep 13, 2024
b7b9d77
Merged PR 42836: [internal/release/6.0.1xx] Update dependencies from …
Sep 13, 2024
8639fd1
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Sep 13, 2024
9680aa2
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Sep 14, 2024
2a0b429
Merged PR 42847: [internal/release/6.0.1xx] Update dependencies from …
Sep 16, 2024
38da01b
Merged PR 42867: [internal/release/6.0.1xx] Merge from public
vseanreesermsft Sep 16, 2024
407eb0f
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Sep 16, 2024
817d9ca
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Sep 17, 2024
9b2a203
Merged PR 42876: [internal/release/6.0.1xx] Update dependencies from …
Sep 17, 2024
e26d39f
Update branding to 6.0.136
vseanreesermsft Oct 1, 2024
a9570e6
Switch back to macos 13
marcpopMSFT Oct 2, 2024
be40b35
Switch to macos 13
marcpopMSFT Oct 2, 2024
3702ac3
Update branding to 6.0.136 (#20145)
marcpopMSFT Oct 3, 2024
ad0c7b0
[release/6.0.1xx] Update dependencies from dotnet/arcade (#20138)
dotnet-maestro[bot] Oct 3, 2024
c9ad64a
Merge commit '9b2a203ee661f837f50486a8caedc688e05dedc4' into internal…
vseanreesermsft Oct 8, 2024
fe1860b
Merging internal commits for release/6.0.1xx (#20166)
marcpopMSFT Oct 8, 2024
9e1016a
.NET Source-Build 6.0.135 October 2024 Updates (#20171)
dotnet-sb-bot Oct 9, 2024
2649bfc
Update SDK Diff Baseline (#20176)
ellahathaway Oct 10, 2024
29a0f9d
Update dependencies from https://github.com/dotnet/arcade build 20241…
dotnet-maestro[bot] Oct 10, 2024
329046d
[release/6.0.1xx] Update dependencies from dotnet/arcade (#20182)
v-wuzhai Oct 11, 2024
2449eec
Merge branch 'release/6.0.4xx' of https://github.com/dotnet/installer…
v-wuzhai Oct 11, 2024
1872605
[automated] Merge branch 'release/6.0.1xx' => 'release/6.0.4xx' (#20180)
marcpopMSFT Oct 14, 2024
a644847
Update Windows SDK projection
manodasanW Oct 15, 2024
d6c542e
[release/6.0.4xx] Update Windows SDK projection versions (#20197)
marcpopMSFT Oct 15, 2024
231543a
Merge branch 'release/8.0.1xx' of https://github.com/dotnet/installer…
v-wuzhai Oct 16, 2024
8ab09c8
[automated] Merge branch 'release/6.0.4xx' => 'release/8.0.1xx' (#20199)
v-wuzhai Oct 16, 2024
ef92ab0
[release/8.0.1xx] Update dependencies from dotnet/arcade (#20205)
dotnet-maestro[bot] Oct 16, 2024
e051555
Update dependencies from https://github.com/dotnet/source-build-exter…
dotnet-maestro[bot] Oct 16, 2024
4b1779d
[release/8.0.1xx] Update dependencies from dotnet/source-build-extern…
v-wuzhai Oct 17, 2024
3da8ff9
Fix assembly version diff test for missing file (#20212)
mthalman Oct 21, 2024
30e4127
Merge branch 'release/8.0.3xx' of https://github.com/dotnet/installer…
v-wuzhai Oct 22, 2024
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
8 changes: 6 additions & 2 deletions src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/SdkContentTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,11 @@ private static void RemoveExcludedAssemblyVersionPaths(Dictionary<string, Versio
{
string assemblyPath = sbSdkFileArray[i];
Version? sbVersion = sbSdkAssemblyVersions[assemblyPath];
Version? msftVersion = msftSdkAssemblyVersions[assemblyPath];
if (!msftSdkAssemblyVersions.TryGetValue(assemblyPath, out Version? msftVersion))
{
sbSdkAssemblyVersions.Remove(assemblyPath);
continue;
}

if (sbVersion is not null &&
msftVersion is not null &&
Expand Down Expand Up @@ -163,7 +167,7 @@ private string FindMatchingFilePath(string rootDir, Matcher matcher, string repr
}
}

Assert.Fail($"Unable to find matching file for '{representativeFile}' in '{rootDir}'.");
OutputHelper.WriteLine($"Unable to find matching file for '{representativeFile}' in '{rootDir}'.");
return string.Empty;
}

Expand Down