File tree 4 files changed +22
-7
lines changed
SamplesApp/SamplesApp.Wasm
SourceGenerators/Uno.UI.Tasks/Content 4 files changed +22
-7
lines changed Original file line number Diff line number Diff line change 75
75
<PackageReference Update =" Uno.Core.Extensions.Disposables" Version =" 4.0.1" />
76
76
<PackageReference Update =" Uno.Core.Extensions.Compatibility" Version =" 4.0.1" />
77
77
<PackageReference Update =" Uno.Diagnostics.Eventing" Version =" 2.0.1" />
78
- <PackageReference Update =" Uno.Wasm.Bootstrap" Version =" 9.0.0-dev.86 " />
79
- <PackageReference Update =" Uno.Wasm.Bootstrap.DevServer" Version =" 9.0.0-dev.86 " />
78
+ <PackageReference Update =" Uno.Wasm.Bootstrap" Version =" 9.0.0-dev.270 " />
79
+ <PackageReference Update =" Uno.Wasm.Bootstrap.DevServer" Version =" 9.0.0-dev.270 " />
80
80
<PackageReference Update =" MSTest" Version =" 3.3.1" />
81
81
<PackageReference Update =" MSTest.TestFramework" Version =" 3.3.1" />
82
82
<PackageReference Update =" MSTest.TestAdapter" Version =" 3.3.1" />
Original file line number Diff line number Diff line change 1
1
<?xml version =" 1.0" encoding =" utf-8" ?>
2
- <Project Sdk =" Microsoft.NET.Sdk.Web " >
2
+ <Project Sdk =" Microsoft.NET.Sdk.WebAssembly " >
3
3
<PropertyGroup >
4
4
<TargetFrameworks >$(NetWasmPreviousAndCurrent)</TargetFrameworks >
5
5
</PropertyGroup >
9
9
<PropertyGroup >
10
10
<OutputType >Exe</OutputType >
11
11
<DefineConstants >$(DefineConstants);__WASM__;HAS_UNO;UNO_REFERENCE_API</DefineConstants >
12
- <NoWarn >$(NoWarn);NU1701;CS1998;NU1504;UXAML0002</NoWarn >
12
+ <NoWarn >$(NoWarn);NU1701;CS1998;NU1504;UXAML0002;NU1903;NU1902;IL2026;IL2072;IL2067;IL2075;IL2070;IL2077;IL2057 </NoWarn >
13
13
<IsUiAutomationMappingEnabled >true</IsUiAutomationMappingEnabled >
14
14
<UseUnoXamlParser >true</UseUnoXamlParser >
15
15
<UnoRuntimeIdentifier >WebAssembly</UnoRuntimeIdentifier >
Original file line number Diff line number Diff line change 107
107
</ItemGroup >
108
108
</Target >
109
109
110
+ <PropertyGroup >
111
+ <_UnoAddLibraryAssetsBeforeTargets >
112
+ $(_UnoAddLibraryAssetsBeforeTargets);
113
+ GetCopyToOutputDirectoryItems;
114
+ GenerateUnoWasmAssets;
115
+ </_UnoAddLibraryAssetsBeforeTargets >
116
+ </PropertyGroup >
117
+
110
118
<!--
111
119
Populate output groups when building heads
112
120
-->
113
121
<Target Name =" _UnoAddLibraryAssets"
114
122
Condition=" '$(IsUnoHead)'=='true' or '$(AndroidApplication)'=='true' or '$(ProjectTypeGuids)'!=''"
115
123
DependsOnTargets=" _UnoFindPackageAssetMarkers"
116
- BeforeTargets=" GetCopyToOutputDirectoryItems " >
124
+ BeforeTargets=" $(_UnoAddLibraryAssetsBeforeTargets) " >
117
125
118
126
<ExpandPackageAssets_v0 MarkerFiles =" @(_UnoPriFiles)" >
119
127
<Output TaskParameter =" Assets" ItemName =" _UnoAssetsFilesExpanded" />
Original file line number Diff line number Diff line change @@ -14,7 +14,14 @@ Copyright (C) Uno Platform Inc. All rights reserved.
14
14
<!-- Legacy Project System Support -->
15
15
<_DefaultMicrosoftNETSdk Condition =" $(SingleProject) != 'true' AND $(UnoSingleProject) != 'true' AND ($(MSBuildProjectName.EndsWith('.Wasm')) or $(MSBuildProjectName.EndsWith('.WebAssembly')))" >Microsoft.NET.Sdk.Web</_DefaultMicrosoftNETSdk >
16
16
17
- <_DefaultMicrosoftNETSdk Condition =" $([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'browserwasm'" >Microsoft.NET.Sdk.Web</_DefaultMicrosoftNETSdk >
17
+ <_UnoUseMicrosoftNETSdkWebAssembly Condition ="
18
+ $([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'browserwasm'
19
+ AND $([MSBuild]::GetTargetFrameworkVersion('$(TargetFramework)')) < 9.0
20
+ " >true</_UnoUseMicrosoftNETSdkWebAssembly >
21
+
22
+ <_DefaultMicrosoftNETSdk Condition =" '$(_UnoUseMicrosoftNETSdkWebAssembly)' == '' " >Microsoft.NET.Sdk.Web</_DefaultMicrosoftNETSdk >
23
+ <_DefaultMicrosoftNETSdk Condition =" '$(_UnoUseMicrosoftNETSdkWebAssembly)' == 'true' " >Microsoft.NET.Sdk.WebAssembly</_DefaultMicrosoftNETSdk >
24
+
18
25
<_DefaultMicrosoftNETSdk Condition =" $(_DefaultMicrosoftNETSdk) == '' " >Microsoft.NET.Sdk</_DefaultMicrosoftNETSdk >
19
26
20
27
<_DefaultWasmOutputType Condition =" $([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'browserwasm'" >$(OutputType)</_DefaultWasmOutputType >
@@ -73,7 +80,7 @@ Copyright (C) Uno Platform Inc. All rights reserved.
73
80
VS to read the global properties and avoid showing a yellow icon being the result of a mismatch
74
81
between runs of design-time builds (one build defining a FrameworkReference and another one not).
75
82
-->
76
- <ItemGroup >
83
+ <ItemGroup Condition = " '$(_UnoUseMicrosoftNETSdkWebAssembly)' == 'false' " >
77
84
<FrameworkReference Remove =" Microsoft.AspNetCore.App" />
78
85
</ItemGroup >
79
86
</Project >
You can’t perform that action at this time.
0 commit comments