|
|
@@ -0,0 +1,96 @@
|
|
|
+From 594c716ad8993df91b4cbade593b9bee7cacae47 Mon Sep 17 00:00:00 2001
|
|
|
+From: Chris Rummel <[email protected]>
|
|
|
+Date: Thu, 3 Sep 2020 06:29:25 -0500
|
|
|
+Subject: [PATCH 11/14] Fix a couple issues.
|
|
|
+
|
|
|
+---
|
|
|
+ AspNetCore.sln | 2 -
|
|
|
+ src/Components/Components.slnf | 1 -
|
|
|
+ src/Components/ComponentsNoDeps.slnf | 1 -
|
|
|
+ .../Driver/Wasm.Performance.Driver.csproj | 37 -------------------
|
|
|
+ 4 files changed, 41 deletions(-)
|
|
|
+ delete mode 100644 src/Components/benchmarkapps/Wasm.Performance/Driver/Wasm.Performance.Driver.csproj
|
|
|
+
|
|
|
+diff --git a/AspNetCore.sln b/AspNetCore.sln
|
|
|
+index 06f5b1b4c6..4a7c2e59a8 100644
|
|
|
+--- a/AspNetCore.sln
|
|
|
++++ b/AspNetCore.sln
|
|
|
+@@ -475,8 +475,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "benchmarkapps", "benchmarka
|
|
|
+ EndProject
|
|
|
+ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Wasm.Performance", "Wasm.Performance", "{6276A9A0-791B-49C1-AD8F-50AC47CDC196}"
|
|
|
+ EndProject
|
|
|
+-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Wasm.Performance.Driver", "src\Components\benchmarkapps\Wasm.Performance\Driver\Wasm.Performance.Driver.csproj", "{B81C7FA1-870F-4F21-A928-A5BE18754E6E}"
|
|
|
+-EndProject
|
|
|
+ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Wasm.Performance.TestApp", "src\Components\benchmarkapps\Wasm.Performance\TestApp\Wasm.Performance.TestApp.csproj", "{2AEACF69-7F68-414A-B49D-2C627D37D0F6}"
|
|
|
+ EndProject
|
|
|
+ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Components.WebAssembly.Server.Tests", "src\Components\WebAssembly\Server\test\Microsoft.AspNetCore.Components.WebAssembly.Server.Tests.csproj", "{0C610220-E00C-4752-98A0-44A3D4B96A21}"
|
|
|
+diff --git a/src/Components/Components.slnf b/src/Components/Components.slnf
|
|
|
+index d023481b95..a28aa122b1 100644
|
|
|
+--- a/src/Components/Components.slnf
|
|
|
++++ b/src/Components/Components.slnf
|
|
|
+@@ -37,7 +37,6 @@
|
|
|
+ "src\\Components\\WebAssembly\\testassets\\WasmLinkerTest.csproj",
|
|
|
+ "src\\Components\\Web\\src\\Microsoft.AspNetCore.Components.Web.csproj",
|
|
|
+ "src\\Components\\Web\\test\\Microsoft.AspNetCore.Components.Web.Tests.csproj",
|
|
|
+- "src\\Components\\benchmarkapps\\Wasm.Performance\\Driver\\Wasm.Performance.Driver.csproj",
|
|
|
+ "src\\Components\\benchmarkapps\\Wasm.Performance\\TestApp\\Wasm.Performance.TestApp.csproj",
|
|
|
+ "src\\Components\\test\\E2ETest\\Microsoft.AspNetCore.Components.E2ETests.csproj",
|
|
|
+ "src\\Components\\test\\testassets\\BasicTestApp\\BasicTestApp.csproj",
|
|
|
+diff --git a/src/Components/ComponentsNoDeps.slnf b/src/Components/ComponentsNoDeps.slnf
|
|
|
+index 7cf830b329..82e51fba83 100644
|
|
|
+--- a/src/Components/ComponentsNoDeps.slnf
|
|
|
++++ b/src/Components/ComponentsNoDeps.slnf
|
|
|
+@@ -39,7 +39,6 @@
|
|
|
+ "src\\Components\\Web\\src\\Microsoft.AspNetCore.Components.Web.csproj",
|
|
|
+ "src\\Components\\Web\\test\\Microsoft.AspNetCore.Components.Web.Tests.csproj",
|
|
|
+ "src\\Components\\benchmarkapps\\Wasm.Performance\\ConsoleHost\\Wasm.Performance.ConsoleHost.csproj",
|
|
|
+- "src\\Components\\benchmarkapps\\Wasm.Performance\\Driver\\Wasm.Performance.Driver.csproj",
|
|
|
+ "src\\Components\\benchmarkapps\\Wasm.Performance\\TestApp\\Wasm.Performance.TestApp.csproj",
|
|
|
+ "src\\Components\\test\\E2ETest\\Microsoft.AspNetCore.Components.E2ETests.csproj",
|
|
|
+ "src\\Components\\test\\testassets\\BasicTestApp\\BasicTestApp.csproj",
|
|
|
+diff --git a/src/Components/benchmarkapps/Wasm.Performance/Driver/Wasm.Performance.Driver.csproj b/src/Components/benchmarkapps/Wasm.Performance/Driver/Wasm.Performance.Driver.csproj
|
|
|
+deleted file mode 100644
|
|
|
+index 346ddc48f1..0000000000
|
|
|
+--- a/src/Components/benchmarkapps/Wasm.Performance/Driver/Wasm.Performance.Driver.csproj
|
|
|
++++ /dev/null
|
|
|
+@@ -1,37 +0,0 @@
|
|
|
+-<Project Sdk="Microsoft.NET.Sdk.Web">
|
|
|
+-
|
|
|
+- <PropertyGroup>
|
|
|
+- <TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
|
|
|
+- <OutputType>exe</OutputType>
|
|
|
+-
|
|
|
+- <IsShippingPackage>false</IsShippingPackage>
|
|
|
+- <!-- WebDriver is not strong-named, so this test project cannot be strong named either. -->
|
|
|
+- <SignAssembly>false</SignAssembly>
|
|
|
+- <IsTestAssetProject>true</IsTestAssetProject>
|
|
|
+- <RuntimeIdentifier>linux-x64</RuntimeIdentifier>
|
|
|
+- </PropertyGroup>
|
|
|
+-
|
|
|
+- <ItemGroup>
|
|
|
+- <Reference Include="Microsoft.AspNetCore" />
|
|
|
+- <Reference Include="Microsoft.AspNetCore.Cors" />
|
|
|
+- <Reference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" />
|
|
|
+- <Reference Include="Selenium.Support" />
|
|
|
+- <Reference Include="Selenium.WebDriver" />
|
|
|
+- <ProjectReference Include="..\TestApp\Wasm.Performance.TestApp.csproj" />
|
|
|
+- </ItemGroup>
|
|
|
+-
|
|
|
+- <ItemGroup>
|
|
|
+- <Compile Include="..\..\..\WebAssembly\DevServer\src\Server\*.cs" />
|
|
|
+- </ItemGroup>
|
|
|
+-
|
|
|
+- <Target Name="_AddTestProjectMetadataAttributes" BeforeTargets="BeforeCompile">
|
|
|
+- <ItemGroup>
|
|
|
+- <AssemblyAttribute
|
|
|
+- Include="System.Reflection.AssemblyMetadataAttribute">
|
|
|
+- <_Parameter1>TestAppLocatiion</_Parameter1>
|
|
|
+- <_Parameter2>$(MSBuildThisFileDirectory)..\TestApp\</_Parameter2>
|
|
|
+- </AssemblyAttribute>
|
|
|
+- </ItemGroup>
|
|
|
+- </Target>
|
|
|
+-
|
|
|
+-</Project>
|
|
|
+--
|
|
|
+2.18.0
|
|
|
+
|