fix e2e

Author: radical

tests/Aspire.EndToEnd.Tests/Aspire.EndToEnd.Tests.csproj

@@ -11,6 +11,10 @@
     <TestUsingWorkloads Condition="! ('$(ContinuousIntegrationBuild)' == 'true' and '$(OS)' == 'Windows_NT')">true</TestUsingWorkloads>
     <InstallWorkloadForTesting>$(TestUsingWorkloads)</InstallWorkloadForTesting>
 
+    <!-- FIXME: make this property specific to hosting.testing -->
+    <RelativeStagingDir>\</RelativeStagingDir>
+    <RootDirForTestsRunningOutOfRepo>testassets\testproject\</RootDirForTestsRunningOutOfRepo>
+
     <IncludeTestPackages>false</IncludeTestPackages>
     <SupportsRunningOutsideOfRepo>true</SupportsRunningOutsideOfRepo>
     <TestsRunningOutsideOfRepo Condition="'$(TestsRunningOutsideOfRepo)' == '' and '$(ContinuousIntegrationBuild)' == 'true'">true</TestsRunningOutsideOfRepo>
@@ -26,22 +30,22 @@
     <None Include="..\testproject\**\*" Link="testassets\testproject\%(RecursiveDir)%(FileName)%(Extension)" CopyToOutputDirectory="PreserveNewest" />
     <None Include="..\.editorconfig" Link="testassets\%(FileName)%(Extension)" CopyToOutputDirectory="PreserveNewest" />
 
-    <None Condition="'$(InstallWorkloadForTesting)' == 'true'" Include="$(TestsSharedDir)nuget-with-package-source-mapping.config" Link="testassets\nuget.config" CopyToOutputDirectory="PreserveNewest" />
+    <!--<None Condition="'$(InstallWorkloadForTesting)' == 'true'" Include="$(TestsSharedDir)nuget-with-package-source-mapping.config" Link="testassets\nuget.config" CopyToOutputDirectory="PreserveNewest" />-->
 
-    <None Include="$(TestsSharedDir)EmptyProject.proj" Link="testassets\Directory.Build.props" CopyToOutputDirectory="PreserveNewest" />
-    <None Include="$(TestsSharedDir)EmptyProject.proj" Link="testassets\Directory.Build.targets" CopyToOutputDirectory="PreserveNewest" />
-    <None Include="$(TestsSharedRepoTestingDir)\*" Link="testassets\%(FileName)%(Extension)" CopyToOutputDirectory="PreserveNewest" />
+    <!--<None Include="$(TestsSharedDir)EmptyProject.proj" Link="testassets\Directory.Build.props" CopyToOutputDirectory="PreserveNewest" />-->
+    <!--<None Include="$(TestsSharedDir)EmptyProject.proj" Link="testassets\Directory.Build.targets" CopyToOutputDirectory="PreserveNewest" />-->
+    <!--<None Include="$(TestsSharedRepoTestingDir)\*" Link="testassets\%(FileName)%(Extension)" CopyToOutputDirectory="PreserveNewest" />-->
 
-    <None Include="$(GeneratedPackagesVersionsPropsPath)" Link="testassets\Directory.Packages.Versions.props" CopyToOutputDirectory="PreserveNewest" />
+    <!--<None Include="$(GeneratedPackagesVersionsPropsPath)" Link="testassets\Directory.Packages.Versions.props" CopyToOutputDirectory="PreserveNewest" />-->
 
     <PackageReference Include="Microsoft.Extensions.Http.Resilience" />
     <PackageReference Include="Microsoft.DotNet.XUnitExtensions" />
 
-    <PropertyForHelixRun Include="XunitPackageVersion" />
-    <PropertyForHelixRun Include="XunitRunnerVisualStudioPackageVersion" />
-    <PropertyForHelixRun Include="XunitPackageVersion" />
-    <PropertyForHelixRun Include="MSTestTestAdapterPackageVersion" />
-    <PropertyForHelixRun Include="MicrosoftNETTestSdkPackageVersion" />
+    <!--<PropertyForHelixRun Include="XunitPackageVersion" />-->
+    <!--<PropertyForHelixRun Include="XunitRunnerVisualStudioPackageVersion" />-->
+    <!--<PropertyForHelixRun Include="XunitPackageVersion" />-->
+    <!--<PropertyForHelixRun Include="MSTestTestAdapterPackageVersion" />-->
+    <!--<PropertyForHelixRun Include="MicrosoftNETTestSdkPackageVersion" />-->
   </ItemGroup>
 
   <Import Project="..\Shared\WorkloadTesting\Aspire.Shared.WorkloadTesting.targets" />

tests/Shared/RepoTesting/Aspire.Testing.Repo.targets

@@ -9,7 +9,8 @@
 
     <IncludeTestPackages Condition="'$(IncludeTestPackages)' == '' and ('$(IsTestProject)' == 'true' or '$(IsTestSupportProject)' == 'true')">true</IncludeTestPackages>
     <GeneratedPackagesVersionsPropsPath>$(IntermediateOutputPath)Directory.Packages.Versions.props</GeneratedPackagesVersionsPropsPath>
-    <RelativeStagingDir Condition="'$(RelativeStagingDir)' == '' and '$(SupportsRunningOutsideOfRepo)' == 'true'">staging-for-archive\</RelativeStagingDir>
+    <!-- FIXME: probably can be supporting*==true -->
+    <RelativeStagingDir Condition="'$(RelativeStagingDir)' == '' and '$(SupportsRunningOutsideOfRepo)' == 'true' and '$(IsHostingTestingProject)' == 'true'">staging-for-archive\</RelativeStagingDir>
     <RelativeStagingDir>$([MSBuild]::EnsureTrailingSlash('$(RelativeStagingDir)'))</RelativeStagingDir>
     <TestArchiveTestsDir Condition="'$(TestArchiveTestsDir)' == '' and '$(SupportsRunningOutsideOfRepo)' == 'true'">$(TestArchiveTestsDirForPlaygroundTests)</TestArchiveTestsDir>
   </PropertyGroup>
@@ -50,7 +51,7 @@
     <None Include="$(TestsSharedDir)WorkloadTesting\data\Directory.Packages.Helix.props" Link="$(RelativeStagingDir)%(FileName)%(Extension)" CopyToOutputDirectory="PreserveNewest" />
 
     <!-- FIXME: should this be in the test project?? -->
-    <None Include="$(TestsSharedDir)\**\*" Link="staging-for-archive\tests\Shared\%(RecursiveDir)%(FileName)%(Extension)" CopyToOutputDirectory="PreserveNewest" />
+    <None Include="$(TestsSharedDir)\**\*" Link="$(RelativeStagingDir)tests\Shared\%(RecursiveDir)%(FileName)%(Extension)" CopyToOutputDirectory="PreserveNewest" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(SupportsRunningOutsideOfRepo)' == 'true'">