Skip to content

Commit 7c05f59

Browse files
authored
Complete pipeline migration (#41)
1 parent 952220f commit 7c05f59

File tree

2 files changed

+13
-21
lines changed

2 files changed

+13
-21
lines changed

.github/workflows/dotnet.yml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,10 @@ jobs:
2020
uses: actions/checkout@v4
2121

2222
- name: Setup .NET
23-
uses: actions/setup-dotnet@v3
24-
with:
25-
dotnet-version: '8.0.x'
23+
uses: actions/setup-dotnet@v4
2624

2725
- name: Setup MSBuild
28-
uses: microsoft/setup-msbuild@v1
26+
uses: microsoft/setup-msbuild@v2
2927

3028
- name: Setup NuGet
3129
uses: nuget/setup-nuget@v2
@@ -40,11 +38,14 @@ jobs:
4038
echo "BUILD_CONFIG=Release" | Out-File -FilePath $env:GITHUB_ENV -Append
4139
}
4240
43-
- name: Restore Dependencies
41+
- name: Restore Nuget
4442
run: nuget restore ReswPlus.sln
4543

44+
- name: DotNet Restore
45+
run: dotnet restore ReswPlus.sln
46+
4647
- name: Build Solution
47-
run: msbuild ReswPlus.sln /p:Configuration=${{ env.BUILD_CONFIG }} /p:Platform="Any CPU" /p:RuntimeIdentifierOverride=win-x64
48+
run: msbuild ReswPlus.sln /p:Configuration=${{ env.BUILD_CONFIG }} /p:Platform=x64 /p:PublishReadyToRun=false
4849

4950
- name: Run Unit Tests
5051
run: dotnet test tests/ReswPlusUnitTests/ReswPlusUnitTests.csproj --configuration ${{ env.BUILD_CONFIG }} --no-build --verbosity normal

samples/WinAppSDK/ReswPlusWinAppSDKSample/ReswPlusWinAppSDKSample.csproj

Lines changed: 6 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
<RootNamespace>ReswPlusWinAppSDKSample</RootNamespace>
88
<ApplicationManifest>app.manifest</ApplicationManifest>
99
<Platforms>x86;x64;ARM64</Platforms>
10-
<RuntimeIdentifiers>win-x86;win-x64;win-arm64</RuntimeIdentifiers>
1110
<PublishProfile>win-$(Platform).pubxml</PublishProfile>
1211
<UseWinUI>true</UseWinUI>
1312
<EnableMsixTooling>true</EnableMsixTooling>
@@ -23,10 +22,9 @@
2322
<AppxBundle>Always</AppxBundle>
2423
<AppxBundlePlatforms>x86|x64|arm64</AppxBundlePlatforms>
2524
<HoursBetweenUpdateChecks>0</HoursBetweenUpdateChecks>
25+
<RuntimeIdentifiers>win-x86;win-x64;win-arm64</RuntimeIdentifiers>
2626
</PropertyGroup>
27-
<PropertyGroup Condition="'$(RuntimeIdentifierOverride)' != ''">
28-
<RuntimeIdentifier>$(RuntimeIdentifierOverride)</RuntimeIdentifier>
29-
</PropertyGroup>
27+
3028
<ItemGroup>
3129
<Content Include="Assets\SplashScreen.scale-200.png" />
3230
<Content Include="Assets\Square150x150Logo.scale-200.png" />
@@ -41,27 +39,25 @@
4139
<Manifest Include="$(ApplicationManifest)" />
4240
</ItemGroup>
4341

44-
<!--
45-
Defining the "Msix" ProjectCapability here allows the Single-project MSIX Packaging
46-
Tools extension to be activated for this project even if the Windows App SDK Nuget
47-
package has not yet been restored.
48-
-->
4942
<ItemGroup Condition="'$(DisableMsixProjectCapabilityAddedByProject)'!='true' and '$(EnableMsixTooling)'=='true'">
5043
<ProjectCapability Include="Msix" />
5144
</ItemGroup>
45+
5246
<ItemGroup>
5347
<ProjectReference Include="..\..\..\src\ReswPlus.SourceGenerator\ReswPlus.SourceGenerator.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" Private="false">
5448
<Project>{44d125b3-6c8a-4f2f-a76f-bffb2ad7e70d}</Project>
5549
<Name>ReswPlus.SourceGenerator</Name>
5650
</ProjectReference>
5751
<ProjectReference Include="..\ReswPlusWinAppSDKSampleExternalLibrary\ReswPlusWinAppSDKSampleExternalLibrary.csproj" />
5852
</ItemGroup>
53+
5954
<ItemGroup>
6055
<None Update="Assets\Icon.png">
6156
<Pack>True</Pack>
6257
<PackagePath>\</PackagePath>
6358
</None>
6459
</ItemGroup>
60+
6561
<ItemGroup>
6662
<Page Update="MainControl.xaml">
6763
<SubType>Designer</SubType>
@@ -95,12 +91,7 @@
9591
</Page>
9692
</ItemGroup>
9793

98-
<!--
99-
Defining the "HasPackageAndPublishMenuAddedByProject" property here allows the Solution
100-
Explorer "Package and Publish" context menu entry to be enabled for this project even if
101-
the Windows App SDK Nuget package has not yet been restored.
102-
-->
10394
<PropertyGroup Condition="'$(DisableHasPackageAndPublishMenuAddedByProject)'!='true' and '$(EnableMsixTooling)'=='true'">
10495
<HasPackageAndPublishMenu>true</HasPackageAndPublishMenu>
10596
</PropertyGroup>
106-
</Project>
97+
</Project>

0 commit comments

Comments
 (0)