Skip to content

Commit

Permalink
[wasm] Move interop project refs to common place (#72367)
Browse files Browse the repository at this point in the history
So that all the wasm samples have access to the new interop
  • Loading branch information
radekdoulik authored Jul 18, 2022
1 parent 86a4ec3 commit 349d811
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 6 deletions.
5 changes: 5 additions & 0 deletions src/mono/sample/wasm/Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,11 @@
<WasmEmitSymbolMap>true</WasmEmitSymbolMap>
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="$(LibrariesProjectRoot)System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj" OutputItemTpe="Analyzer" ReferenceOutputAssembly="false" />
<ProjectReference Include="$(LibrariesProjectRoot)System.Runtime.InteropServices.JavaScript\gen\JSImportGenerator\JSImportGenerator.csproj" OutputItemType="Analyzer" ReferencOutputAssembly="false" />
</ItemGroup>

<!-- Import late, so properties like $(ArtifactsBinDir) are set -->
<Import Project="$(MonoProjectRoot)wasm\build\WasmApp.InTree.props" />
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,5 @@
<Compile Include="../*.cs" />
<Compile Remove="../Browser.cs" />
<PackageReference Include="Mono.Options" Version="6.12.0.148" />
<ProjectReference Include="$(LibrariesProjectRoot)System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
<ProjectReference Include="$(LibrariesProjectRoot)System.Runtime.InteropServices.JavaScript\gen\JSImportGenerator\JSImportGenerator.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,6 @@
<WasmExtraFilesToDeploy Include="frame-main.js" />
<WasmExtraFilesToDeploy Include="style.css" />
<Compile Remove="Console/Console.cs" />
<ProjectReference Include="$(LibrariesProjectRoot)System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
<ProjectReference Include="$(LibrariesProjectRoot)System.Runtime.InteropServices.JavaScript\gen\JSImportGenerator\JSImportGenerator.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
</ItemGroup>

<PropertyGroup>
Expand Down
2 changes: 0 additions & 2 deletions src/mono/sample/wasm/browser/Wasm.Browser.ES6.Sample.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@
</PropertyGroup>
<ItemGroup>
<WasmExtraFilesToDeploy Include="index.html" />
<ProjectReference Include="$(LibrariesProjectRoot)System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
<ProjectReference Include="$(LibrariesProjectRoot)System.Runtime.InteropServices.JavaScript\gen\JSImportGenerator\JSImportGenerator.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
</ItemGroup>
<PropertyGroup>
<_SampleProject>Wasm.Browser.ES6.Sample.csproj</_SampleProject>
Expand Down

0 comments on commit 349d811

Please sign in to comment.