[ArPow Tarball] Tier 4 - Add vstest repo to arpow tarball (#11077)

This commit is contained in:
Michael Simons 2021-07-12 16:54:36 -05:00 committed by GitHub
parent 58bfec72c1
commit f1b634b690
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 37 additions and 14 deletions

View file

@ -32,6 +32,11 @@
<SourceBuild RepoName="linker" ManagedOnly="true" /> <SourceBuild RepoName="linker" ManagedOnly="true" />
<RepoName>linker</RepoName> <RepoName>linker</RepoName>
</Dependency> </Dependency>
<Dependency Name="Microsoft.NET.Test.Sdk" Version="17.0.0-preview-20210629-04" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/microsoft/vstest</Uri>
<Sha>e078bbadaf65628c313e97041973db52a84491ef</Sha>
<SourceBuild RepoName="vstest" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.Web.Xdt" Version="5.0.0-preview.21302.1"> <Dependency Name="Microsoft.Web.Xdt" Version="5.0.0-preview.21302.1">
<Uri>https://github.com/dotnet/xdt</Uri> <Uri>https://github.com/dotnet/xdt</Uri>
<Sha>6a46e7c886cdf499ba3433f665ab417be814135e</Sha> <Sha>6a46e7c886cdf499ba3433f665ab417be814135e</Sha>

View file

@ -0,0 +1,26 @@
From 0fc9ffcb249411f9911a6e13f939eaf95bf219c8 Mon Sep 17 00:00:00 2001
From: MichaelSimons <msimons@microsoft.com>
Date: Wed, 7 Jul 2021 20:57:34 +0000
Subject: [PATCH] Condition win7-x86 RID
Eliminate build errors from source-build building for linux RIDs
---
src/SettingsMigrator/SettingsMigrator.csproj | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/SettingsMigrator/SettingsMigrator.csproj b/src/SettingsMigrator/SettingsMigrator.csproj
index 4f9f6a30..528ed1a4 100644
--- a/src/SettingsMigrator/SettingsMigrator.csproj
+++ b/src/SettingsMigrator/SettingsMigrator.csproj
@@ -15,7 +15,7 @@
<PlatformTarget>AnyCPU</PlatformTarget>
<Prefer32Bit>true</Prefer32Bit>
</PropertyGroup>
- <PropertyGroup>
+ <PropertyGroup Condition="'$(TargetFramework)' == 'net451'">
<RuntimeIdentifier>win7-x64</RuntimeIdentifier>
</PropertyGroup>
<ItemGroup>
--
2.26.2

View file

@ -47,6 +47,7 @@
<!-- Tier 4 --> <!-- Tier 4 -->
<RepositoryReference Include="fsharp" /> <RepositoryReference Include="fsharp" />
<RepositoryReference Include="vstest" />
<!-- Package source-build artifacts --> <!-- Package source-build artifacts -->
<RepositoryReference Include="package-source-build" /> <RepositoryReference Include="package-source-build" />

View file

@ -2,17 +2,8 @@
<Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" /> <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
<PropertyGroup> <PropertyGroup>
<OverrideTargetRid>$(TargetRid)</OverrideTargetRid> <BuildCommandArgs>$(StandardSourceBuildArgs) /p:SemanticVersioningV1=true</BuildCommandArgs>
<OverrideTargetRid Condition="'$(TargetOS)' == 'FreeBSD'">freebsd-x64</OverrideTargetRid> <BuildCommand>$(ProjectDirectory)\eng\common\build$(ShellExtension) $(BuildCommandArgs)</BuildCommand>
<BuildCommandArgs>-DotNetBuildFromSource</BuildCommandArgs>
<BuildCommandArgs>$(BuildCommandArgs) -DotNetCoreSdkDir $(DotNetCliToolDir)</BuildCommandArgs>
<BuildCommandArgs>$(BuildCommandArgs) -c $(Configuration)</BuildCommandArgs>
<BuildCommandArgs>$(BuildCommandArgs) -r $(OverrideTargetRid)</BuildCommandArgs>
<BuildCommandArgs>$(BuildCommandArgs) -v $(OutputPackageVersion)</BuildCommandArgs>
<BuildCommandArgs>$(BuildCommandArgs) $(FlagParameterPrefix)warnAsError $(ArcadeFalseBoolBuildArg)</BuildCommandArgs>
<BuildCommand>$(ProjectDirectory)/build$(ShellExtension) $(BuildCommandArgs)</BuildCommand>
<RepoApiImplemented>false</RepoApiImplemented> <RepoApiImplemented>false</RepoApiImplemented>
<DeterministicBuildOptOut>true</DeterministicBuildOptOut> <DeterministicBuildOptOut>true</DeterministicBuildOptOut>
@ -20,10 +11,10 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<EnvironmentVariables Include="DotNetPackageVersionPropsPath=$(PackageVersionPropsPath)" />
<RepositoryReference Include="diagnostics" /> <RepositoryReference Include="diagnostics" />
<RepositoryReference Include="runtime" /> <!-- TODO: Enable with https://github.com/dotnet/source-build/issues/2275
<RepositoryReference Include="newtonsoft-json" /> <RepositoryReference Include="runtime" /> -->
<RepositoryReference Include="source-build" />
</ItemGroup> </ItemGroup>
<Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" /> <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />