Merge in 'release/7.0' changes

dotnet · Nov 27, 2023 · 47e4074 · 47e4074
2 parents ef956a2 + 94b47e5
commit 47e4074
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 2 deletions.
diff --git a/...omponents/WebView/Samples/PhotinoPlatform/testassets/PhotinoTestApp/PhotinoTestApp.csproj b/...omponents/WebView/Samples/PhotinoPlatform/testassets/PhotinoTestApp/PhotinoTestApp.csproj
@@ -7,7 +7,7 @@
     <SignAssembly>false</SignAssembly>
   </PropertyGroup>
 
-  <Import Project="..\..\..\..\WebView\src\buildTransitive\any\Microsoft.AspNetCore.Components.WebView.props" />
+  <Import Project="..\..\..\..\WebView\src\buildTransitive\Microsoft.AspNetCore.Components.WebView.props" />
 
   <ItemGroup>
     <ProjectReference Include="..\..\src\Microsoft.AspNetCore.Components.WebView.Photino.csproj" />

diff --git a/src/Components/WebView/WebView/src/Microsoft.AspNetCore.Components.WebView.csproj b/src/Components/WebView/WebView/src/Microsoft.AspNetCore.Components.WebView.csproj
@@ -33,7 +33,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <None Include="buildTransitive\any\Microsoft.AspNetCore.Components.WebView.props" Pack="true" PackagePath="%(Identity)" />
+    <None Include="buildTransitive\Microsoft.AspNetCore.Components.WebView.props" Pack="true" PackagePath="%(Identity)" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/...osoft.AspNetCore.Components.WebView.props → ...osoft.AspNetCore.Components.WebView.props b/...osoft.AspNetCore.Components.WebView.props → ...osoft.AspNetCore.Components.WebView.props
diff --git a/...nts/WebView/WebView/src/buildMultiTargeting/Microsoft.AspNetCore.Components.WebView.props b/...nts/WebView/WebView/src/buildMultiTargeting/Microsoft.AspNetCore.Components.WebView.props
@@ -0,0 +1,3 @@
+<Project>
+  <Import Project="..\build\Microsoft.AspNetCore.Components.WebView.props" />
+</Project>
diff --git a/...ponents/WebView/WebView/src/buildTransitive/Microsoft.AspNetCore.Components.WebView.props b/...ponents/WebView/WebView/src/buildTransitive/Microsoft.AspNetCore.Components.WebView.props
@@ -0,0 +1,3 @@
+<Project>
+  <Import Project="..\build\Microsoft.AspNetCore.Components.WebView.props" />
+</Project>