add AllowTestProjectUsage

dotnet · May 17, 2023 · d8487f8 · d8487f8
1 parent 433271b
commit d8487f8
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/eng/SourceBuild.props b/eng/SourceBuild.props
@@ -8,6 +8,10 @@
   <PropertyGroup>
     <BaseInnerSourceBuildCommand>./build.sh</BaseInnerSourceBuildCommand>
 
+    <!-- AfterSourceBuild.proj will fail the build if project path has `test` in it (example: src/libraries/pretest.proj) -->
+    <!-- Will be removed by https://github.com/dotnet/arcade/issues/13542 -->
+    <AllowTestProjectUsage>true</AllowTestProjectUsage>
+
     <!-- TargetRid names what gets built. -->
     <TargetRid Condition="'$(TargetRid)' == ''">$([System.Runtime.InteropServices.RuntimeInformation]::RuntimeIdentifier)</TargetRid>
 

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
@@ -110,10 +110,6 @@
     <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23265.1">
       <Uri>https://github.com/dotnet/arcade</Uri>
       <Sha>2d8d59065b5e090584a8e90c4371fc06ed60bdc5</Sha>
-    </Dependency>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23260.3">
-      <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>06faa97f3e5232df0ddad42caaf28eea39d4ad1a</Sha>
       <SourceBuild RepoName="arcade" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.SourceLink.GitHub" Version="8.0.0-beta.23218.3" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">

diff --git a/eng/Versions.props b/eng/Versions.props
@@ -93,7 +93,9 @@
     <MicrosoftDotNetBuildTasksArchivesVersion>8.0.0-beta.23265.1</MicrosoftDotNetBuildTasksArchivesVersion>
     <MicrosoftDotNetBuildTasksInstallersVersion>8.0.0-beta.23265.1</MicrosoftDotNetBuildTasksInstallersVersion>
     <MicrosoftDotNetBuildTasksPackagingVersion>8.0.0-beta.23265.1</MicrosoftDotNetBuildTasksPackagingVersion>
-    <MicrosoftDotNetBuildTasksTargetFrameworkVersion>8.0.0-beta.23265.1</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
+    <!-- Will be removed once latest SBRP flows into Arcade -->
+    <MicrosoftDotNetBuildTasksTargetFrameworkVersion>8.0.0-beta.23259.5</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
+    <!-- <MicrosoftDotNetBuildTasksTargetFrameworkVersion>8.0.0-beta.23265.1</MicrosoftDotNetBuildTasksTargetFrameworkVersion> -->
     <MicrosoftDotNetBuildTasksTemplatingVersion>8.0.0-beta.23265.1</MicrosoftDotNetBuildTasksTemplatingVersion>
     <MicrosoftDotNetBuildTasksWorkloadsPackageVersion>8.0.0-beta.23265.1</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
     <MicrosoftDotNetRemoteExecutorVersion>8.0.0-beta.23265.1</MicrosoftDotNetRemoteExecutorVersion>