Skip to content

Commit 5e8077b

Browse files
committed
Merge
2 parents 4afeaef + 6bc1f28 commit 5e8077b

File tree

7 files changed

+41
-3
lines changed

7 files changed

+41
-3
lines changed

.github/workflows/build.yml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,13 @@ jobs:
9595
PROJECT_DIRECTORY: tooling/ProjectTemplate
9696

9797
steps:
98+
- name: Configure Pagefile
99+
uses: al-cheb/[email protected]
100+
with:
101+
minimum-size: 32GB
102+
maximum-size: 32GB
103+
disk-root: "C:"
104+
98105
- name: Install .NET SDK v${{ env.DOTNET_VERSION }}
99106
uses: actions/setup-dotnet@v3
100107
with:
@@ -140,6 +147,13 @@ jobs:
140147
TEST_PROJECT_DIRECTORY: components/CiTestExp
141148

142149
steps:
150+
- name: Configure Pagefile
151+
uses: al-cheb/[email protected]
152+
with:
153+
minimum-size: 32GB
154+
maximum-size: 32GB
155+
disk-root: "C:"
156+
143157
- name: Install .NET SDK v${{ env.DOTNET_VERSION }}
144158
uses: actions/setup-dotnet@v3
145159
with:

GenerateAllSolution.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ if ($IncludeHeads -ne 'uwp')
7070
if ($UseDiagnostics.IsPresent)
7171
{
7272
$sdkoptions = " -d"
73-
$diagnostics = '-bl:slngen.binlog --consolelogger:"ShowEventId;Summary;Verbosity=Detailed" --filelogger:"LogFile=slngen.log;Append;Verbosity=Diagnostic;Encoding=UTF-8" '
73+
$diagnostics = '-bl:slngen.binlog --consolelogger:"ShowEventId;Summary;Verbosity=Detailed" '
7474
}
7575
else
7676
{

MultiTarget/PackageReferences/Uno.props

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,14 @@
2626
<NoWarn>$(NoWarn);NU1701</NoWarn>
2727
</PropertyGroup>
2828

29+
<PropertyGroup>
30+
<!--
31+
Uno uses IDisposable internally, but exposes it publicly.
32+
See https://github.com/CommunityToolkit/Labs-Windows/pull/275#issuecomment-1331113635
33+
-->
34+
<NoWarn>$(NoWarn);CA1063;CA1001;</NoWarn>
35+
</PropertyGroup>
36+
2937
<ItemGroup Condition="'$(IsWasmHead)' == 'true'">
3038
<PackageReference Include="Uno.UI.WebAssembly" Version="4.6.18" />
3139
</ItemGroup>

ProjectHeads/AllComponents/Uwp/Package.appxmanifest

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,5 +49,6 @@
4949

5050
<Capabilities>
5151
<Capability Name="internetClient" />
52+
<DeviceCapability Name="webcam"/>
5253
</Capabilities>
5354
</Package>

ProjectHeads/Head.Uwp.props

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,22 @@
2222
</PropertyGroup>
2323

2424
<PropertyGroup Condition="'$(Configuration)' == 'Release'">
25-
<UseDotNetNativeToolchain>true</UseDotNetNativeToolchain>
25+
<!-- Don't overwrite if already defined. Needed for disabling .NET Native in test projects. -->
26+
<UseDotNetNativeToolchain Condition="'$(UseDotNetNativeToolchain)' == ''">true</UseDotNetNativeToolchain>
27+
28+
<!--
29+
Workarounds for ILT0005: Out of memory.
30+
-->
31+
<IlcParameters>/ExtraNutcArguments:"/d2threads1"</IlcParameters>
32+
<SingleThreadNUTC>true</SingleThreadNUTC>
33+
<Use64BitCompiler>true</Use64BitCompiler>
34+
<OutOfProcPDB>true</OutOfProcPDB>
2635
</PropertyGroup>
2736

2837
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
2938
<DebugSymbols>true</DebugSymbols>
3039
<OutputPath>bin\x86\Debug\</OutputPath>
31-
<DefineConstants>$(DefineConstants);DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
40+
<DefineConstants>$(DefineConstants);DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
3241
<DebugType>full</DebugType>
3342
<PlatformTarget>x86</PlatformTarget>
3443
<UseVSHostingProcess>false</UseVSHostingProcess>
@@ -121,6 +130,10 @@
121130
<PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
122131
<Version>6.2.12</Version>
123132
</PackageReference>
133+
<PackageReference Include="PolySharp" Version="1.13.1">
134+
<PrivateAssets>all</PrivateAssets>
135+
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
136+
</PackageReference>
124137
</ItemGroup>
125138

126139
<PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '14.0' ">

ProjectHeads/SingleComponent/Uwp/Package.appxmanifest

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,5 +45,6 @@
4545

4646
<Capabilities>
4747
<Capability Name="internetClient" />
48+
<DeviceCapability Name="webcam"/>
4849
</Capabilities>
4950
</Package>

ProjectHeads/Tests.Head.Uwp.props

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
<!-- Workaround as discussed https://github.com/unoplatform/uno/discussions/5007 for https://developercommunity.visualstudio.com/t/HasSharedItems-is-explicitly-set-to-em/10016046 -->
99
<PropertyGroup>
1010
<SynthesizeLinkMetadata>true</SynthesizeLinkMetadata>
11+
<UseDotNetNativeToolchain>false</UseDotNetNativeToolchain>
1112
</PropertyGroup>
1213

1314
<Choose>

0 commit comments

Comments
 (0)