use commands that work with older version of sdk

Signed-off-by: James Sturtevant <[email protected]>
bytecodealliance · Oct 29, 2024 · c457bd4 · c457bd4
1 parent cfedf56
commit c457bd4
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 10 deletions.
diff --git a/samples/calculator/CalculatorComposed/CalculatorComposed.csproj b/samples/calculator/CalculatorComposed/CalculatorComposed.csproj
@@ -8,9 +8,6 @@
 
     <PropertyGroup>
         <TargetFramework>net8.0</TargetFramework>
-        <RuntimeIdentifier>wasi-wasm</RuntimeIdentifier>
-        <IlcExportUnmanagedEntrypoints>true</IlcExportUnmanagedEntrypoints>
-        <PublishTrimmed>false</PublishTrimmed>
     </PropertyGroup>
 
     <ItemGroup>

diff --git a/samples/calculator/CalculatorHost/CalculatorHost.csproj b/samples/calculator/CalculatorHost/CalculatorHost.csproj
@@ -12,9 +12,6 @@
         <InvariantGlobalization>true</InvariantGlobalization>
         <RuntimeIdentifier>wasi-wasm</RuntimeIdentifier>
         <IlcExportUnmanagedEntrypoints>true</IlcExportUnmanagedEntrypoints>
-        <WasmSingleFileBundle>true</WasmSingleFileBundle>
-        <WasmBuildNative>true</WasmBuildNative>
-        <SelfContained>true</SelfContained>
     </PropertyGroup>
 
     <ItemGroup>

diff --git a/src/WasmComponent.Sdk/WasmComponent.Sdk.csproj b/src/WasmComponent.Sdk/WasmComponent.Sdk.csproj
@@ -37,6 +37,10 @@
         <None Include="../../Readme.md" Pack="true" PackagePath="\"/>
     </ItemGroup>
 
+    <ItemGroup>
+        <None Include="ImportInDev.proj" />
+    </ItemGroup>
+
     <Target Name="BuildOrDownloadNativeTooling" BeforeTargets="Build" DependsOnTargets="BuildNativeTooling; DownloadNativeTooling;">
     </Target>
 

diff --git a/src/WitBindgen/WitBindgen.csproj b/src/WitBindgen/WitBindgen.csproj
@@ -84,6 +84,10 @@
         <WriteLinesToFile File="$(CurrentWkgVersion)" Lines="$(PrebuildWkgVersion)" Overwrite="true" WriteOnlyWhenDifferent="true" />
     </Target>
 
+    <ItemGroup>
+        <None Include="ImportInDev.proj" />
+    </ItemGroup>
+
     <Target Name="PackTaskDependencies" BeforeTargets="GenerateNuspec">
         <ItemGroup>
             <_PackageFiles Include="build\**" BuildAction="Content" PackagePath="build" />

diff --git a/test/E2ETest/PackageTest/PackageTest.csproj b/test/E2ETest/PackageTest/PackageTest.csproj
@@ -37,8 +37,8 @@
         <RemoveDir Directories="$(NugetPackageRoot)\bytecodealliance.componentize.dotnet.witbindgen\$(PackageVersion)" />
         <RemoveDir Directories="..\testapps\E2EProducer\obj" />
         <RemoveDir Directories="..\testapps\E2EConsumer\obj" />
-        <Exec Command="dotnet publish  /bl" WorkingDirectory="..\testapps\E2EProducer" />
-        <Exec Command="dotnet publish  /bl" WorkingDirectory="..\testapps\E2EConsumer" />
+        <Exec Command="dotnet restore --no-cache" WorkingDirectory="..\testapps\E2EConsumer" />
+        <Exec Command="dotnet build --no-restore /bl" WorkingDirectory="..\testapps\E2EConsumer" />
     </Target>
 
     <Target Name="PackPackagesForE2ETest">

diff --git a/test/E2ETest/testapps/E2EConsumer/E2EConsumer.csproj b/test/E2ETest/testapps/E2EConsumer/E2EConsumer.csproj
@@ -28,7 +28,7 @@
     </ItemGroup>
 
     <!-- After build, create the composed component so it can be executed in the test -->
-    <Target Name="ComposeWasmComponent" AfterTargets="LinkNativeLlvm">
+    <Target Name="ComposeWasmComponent" AfterTargets="AfterBuild">
         <PropertyGroup>
             <DependencyComponent>../E2EProducer/bin/$(Configuration)/$(TargetFramework)/wasi-wasm/native/e2eproducer.wasm</DependencyComponent>
         </PropertyGroup>

diff --git a/test/WasmComponentSdkTest/testapps/SimpleConsumer/SimpleConsumer.csproj b/test/WasmComponentSdkTest/testapps/SimpleConsumer/SimpleConsumer.csproj
@@ -26,7 +26,7 @@
     </ItemGroup>
 
     <!-- After build, create the composed component so it can be executed in the test -->
-    <Target Name="ComposeWasmComponent" AfterTargets="LinkNativeLlvm">
+    <Target Name="ComposeWasmComponent" AfterTargets="AfterBuild">
         <PropertyGroup>
             <DependencyComponent>../SimpleProducer/bin/$(Configuration)/$(TargetFramework)/wasi-wasm/native/simpleproducer.wasm</DependencyComponent>
         </PropertyGroup>