PR Feedback:
- Remove reference to Logging package - Update FileGlobbing Version to 8.0 - Move Validation target to installer repo-projects project - Set VSTestUseMSBuildOutput=true in test project file
This commit is contained in:
parent
8daa5ab86d
commit
7ba27a5ea8
5 changed files with 12 additions and 18 deletions
|
@ -137,6 +137,8 @@
|
|||
<SuppressNETCoreSdkPreviewMessage>true</SuppressNETCoreSdkPreviewMessage>
|
||||
<!-- By default, the VMR builds with online sources when not building source-only. -->
|
||||
<DotNetBuildWithOnlineFeeds Condition="'$(DotNetBuildWithOnlineFeeds)' == '' and '$(DotNetBuildSourceOnly)' != 'true'">true</DotNetBuildWithOnlineFeeds>
|
||||
|
||||
<DisableArcadeExcludeFromBuildSupport>true</DisableArcadeExcludeFromBuildSupport>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup>
|
||||
|
|
|
@ -33,6 +33,6 @@
|
|||
<MicrosoftExtensionsLoggingVersion>9.0.0-preview.2.24128.5</MicrosoftExtensionsLoggingVersion>
|
||||
<!-- command-line-api -->
|
||||
<SystemCommandLineVersion>2.0.0-beta4.24126.1</SystemCommandLineVersion>
|
||||
<MicrosoftExtensionsFileSystemGlobbingVersion>7.0.0</MicrosoftExtensionsFileSystemGlobbingVersion>
|
||||
<MicrosoftExtensionsFileSystemGlobbingVersion>8.0.0</MicrosoftExtensionsFileSystemGlobbingVersion>
|
||||
</PropertyGroup>
|
||||
</Project>
|
||||
|
|
|
@ -1,13 +0,0 @@
|
|||
<Project>
|
||||
|
||||
<Target Name="RunUnifiedBuildValidation"
|
||||
AfterTargets="Build">
|
||||
|
||||
<MSBuild Projects="../test/Microsoft.DotNet.UnifiedBuild.Tests/Microsoft.DotNet.UnifiedBuild.Tests.csproj"
|
||||
Targets="VSTest"
|
||||
ContinueOnError="true"
|
||||
Properties="ExcludeFromDotNetBuild=false;VsTestUseMSBuildOutput=true" />
|
||||
|
||||
</Target>
|
||||
|
||||
</Project>
|
|
@ -148,6 +148,13 @@
|
|||
UseHardlinksIfPossible="true" />
|
||||
</Target>
|
||||
|
||||
<Import Project="$(RepositoryEngineeringDir)unifiedBuildValidation.targets" Condition="'$(PortableBuild)' == 'true' and '$(PgoInstrument)' != 'true' and '$(DotNetBuildSourceOnly)' != 'true'" />
|
||||
<Target Name="RunUnifiedBuildValidation"
|
||||
AfterTargets="Build"
|
||||
Condition="'$(PortableBuild)' == 'true' and '$(PgoInstrument)' != 'true' and '$(DotNetBuildSourceOnly)' != 'true'" >
|
||||
<MSBuild Projects="../test/Microsoft.DotNet.UnifiedBuild.Tests/Microsoft.DotNet.UnifiedBuild.Tests.csproj"
|
||||
Targets="VSTest"
|
||||
ContinueOnError="true"
|
||||
Properties="VsTestUseMSBuildOutput=true" />
|
||||
</Target>
|
||||
|
||||
</Project>
|
||||
|
|
|
@ -1,7 +1,5 @@
|
|||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
|
||||
<!-- Pass 'ExcludeFromDotnetBuild=false' when building: test projects are excluded by default -->
|
||||
|
||||
<PropertyGroup>
|
||||
<TargetFramework>$(NetCurrent)</TargetFramework>
|
||||
<Nullable>enable</Nullable>
|
||||
|
@ -9,11 +7,11 @@
|
|||
<UBTestsWarnOnSdkContentDiffs>true</UBTestsWarnOnSdkContentDiffs>
|
||||
<VSTestLogger>console%3bverbosity=diagnostic;trx%3bverbosity=diagnostic%3bLogFileName=Microsoft.DotNet.UnifiedBuild.Tests.xml</VSTestLogger>
|
||||
<VSTestResultsDirectory>$(ArtifactsTestResultsDir)</VSTestResultsDirectory>
|
||||
<VsTestUseMSBuildOutput>true</VsTestUseMSBuildOutput>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Microsoft.Extensions.FileSystemGlobbing" Version="$(MicrosoftExtensionsFileSystemGlobbingVersion)" />
|
||||
<PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.0-preview.2.24128.5" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
|
|
Loading…
Add table
Reference in a new issue