Skip to content
Merged
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
11 changes: 2 additions & 9 deletions .github/workflows/PullRequest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,8 @@ jobs:
run: dotnet workload restore EventLogExpert.slnx
- name: Restore dependencies
run: dotnet restore EventLogExpert.slnx
# Build the MAUI app in its own step (after the tests), NOT as one solution build.
# Building the app together with the test projects makes MSBuild compile the shared
# libraries twice concurrently - the app resolves a Windows RID (win-x64) while the tests
# are AnyCPU - which races on the libs' obj/bin (CS2012 / MSB3030). The old -m:1 flag masked
# this by serializing; this split fixes the root cause. Don't recombine into one slnx build.
- name: Build libraries and tests
run: dotnet build LibrariesAndTests.slnf --no-restore -c Release -p:PublishReadyToRun=false
- name: Build
run: dotnet build EventLogExpert.slnx --no-restore -c Release -p:PublishReadyToRun=false -p:WindowsPackageType=None
- name: Test (unit)
shell: pwsh
run: |
Expand All @@ -56,5 +51,3 @@ jobs:
if ($LASTEXITCODE -ne 0) { $failed = $true }
}
if ($failed) { throw 'One or more integration test projects failed.' }
- name: Build app
run: dotnet build src/EventLogExpert/EventLogExpert.csproj --no-restore -c Release -p:PublishReadyToRun=false
1 change: 1 addition & 0 deletions Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<DebugType>embedded</DebugType>
<!-- CsWinRT1030 fires for List<T> of any public type because IT could theoretically cross the WinRT ABI in AOT/trimmed scenarios. We never marshal these collections across the ABI, so the warning is benign. -->
<NoWarn>$(NoWarn);CsWinRT1030</NoWarn>
</PropertyGroup>
Expand Down
7 changes: 7 additions & 0 deletions Directory.Build.targets
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<Project>
<ItemGroup Condition="'$(OutputType)' == 'Exe' or '$(OutputType)' == 'WinExe'">
<ProjectReference Update="@(ProjectReference)">
<GlobalPropertiesToRemove>$(GlobalPropertiesToRemoveFromProjectReferences);RuntimeIdentifier;SelfContained</GlobalPropertiesToRemove>
</ProjectReference>
</ItemGroup>
</Project>
37 changes: 0 additions & 37 deletions LibrariesAndTests.slnf

This file was deleted.