Browse Source

Fix Nuke build warnings (#21967)

* Fix Nuke build warnings

* Remove PublishProfile from WinUI projects
pull/21968/head
Julien Lebosquain 1 month ago
committed by GitHub
parent
commit
77c9c25ef3
No known key found for this signature in database GPG Key ID: B5690EEEBB952194
  1. 6
      Directory.Packages.props
  2. 6
      nukebuild/ApiDiffHelper.cs
  3. 3
      nukebuild/_build.csproj
  4. 1
      samples/ControlGallery.WinUI/ControlGallery.WinUI.csproj
  5. 1
      samples/WinUIEmbedSample/WinUIEmbedSample.csproj

6
Directory.Packages.props

@ -2,7 +2,6 @@
<PropertyGroup>
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
</PropertyGroup>
<ItemGroup>
<PackageVersion Include="Appium.WebDriver" Version="5.2.0" />
<PackageVersion Include="Avalonia.Angle.Windows.Natives" Version="2.1.27548.20260419" />
@ -37,7 +36,7 @@
<PackageVersion Include="MonoMac.NetStandard" Version="0.0.4" />
<PackageVersion Include="Moq" Version="4.20.72" />
<PackageVersion Include="Nito.AsyncEx.Context" Version="5.1.2" />
<PackageVersion Include="NuGet.Protocol" Version="7.0.1" />
<PackageVersion Include="NuGet.Protocol" Version="7.9.0" />
<PackageVersion Include="Nuke.Common" Version="10.1.0" />
<PackageVersion Include="Numerge" Version="1.0.0" />
<PackageVersion Include="NUnit" Version="4.5.1" />
@ -76,8 +75,7 @@
<PackageVersion Include="xunit.v3.extensibility.core" Version="3.2.2" />
<PackageVersion Include="xunit.v3.mtp-v2" Version="3.2.2" />
</ItemGroup>
<ItemGroup>
<GlobalPackageReference Include="Microsoft.VisualStudio.SlnGen" Version="8.5.17" PrivateAssets="all" />
</ItemGroup>
</Project>
</Project>

6
nukebuild/ApiDiffHelper.cs

@ -399,7 +399,11 @@ public static class ApiDiffHelper
{
var packageSource = new PackageSource(NightlyFeedUri) { ProtocolVersion = 3 };
var repository = Repository.Factory.GetCoreV3(packageSource);
var findPackageByIdResource = await repository.GetResourceAsync<FindPackageByIdResource>();
var findPackageByIdResource =
await repository.GetResourceAsync<FindPackageByIdResource>() ??
throw new InvalidOperationException($"{nameof(FindPackageByIdResource)} not found on {packageSource}");
return new NuGetDownloadContext(packageSource, findPackageByIdResource);
}

3
nukebuild/_build.csproj

@ -13,10 +13,9 @@
<ItemGroup>
<PackageReference Include="Nuke.Common" />
<PackageReference Include="Numerge" />
<!-- Keep in sync with Avalonia.Build.Tasks -->
<PackageReference Include="Mono.Cecil" />
<PackageReference Include="Microsoft.Build.Framework" PrivateAssets="All" />
<PackageReference Include="NuGet.Protocol" />
<PackageReference Include="System.Security.Cryptography.Xml" VersionOverride="10.0.11" /> <!-- Local override to avoid security warnings -->
<PackageDownload Include="Microsoft.DotNet.ApiCompat.Tool" Version="[10.0.100]" />
<PackageDownload Include="Microsoft.DotNet.ApiDiff.Tool" Version="[10.0.100-rtm.25531.102]" />
<PackageDownload Include="dotnet-ilrepack" Version="[2.0.44]" />

1
samples/ControlGallery.WinUI/ControlGallery.WinUI.csproj

@ -7,7 +7,6 @@
<ApplicationManifest>app.manifest</ApplicationManifest>
<Platforms>x86;x64;ARM64</Platforms>
<RuntimeIdentifiers>win-x86;win-x64;win-arm64</RuntimeIdentifiers>
<PublishProfile>win-$(Platform).pubxml</PublishProfile>
<UseWinUI>true</UseWinUI>
<WinUISDKReferences>false</WinUISDKReferences>
<EnableMsixTooling>true</EnableMsixTooling>

1
samples/WinUIEmbedSample/WinUIEmbedSample.csproj

@ -7,7 +7,6 @@
<ApplicationManifest>app.manifest</ApplicationManifest>
<Platforms>x86;x64;ARM64</Platforms>
<RuntimeIdentifiers>win-x86;win-x64;win-arm64</RuntimeIdentifiers>
<PublishProfile>win-$(Platform).pubxml</PublishProfile>
<UseWinUI>true</UseWinUI>
<WinUISDKReferences>false</WinUISDKReferences>
<EnableMsixTooling>true</EnableMsixTooling>

Loading…
Cancel
Save