mirror of
https://github.com/VSadov/Satori.git
synced 2025-06-09 17:44:48 +09:00
Move targets files under eng directory.
Commit migrated from fd8e341b25
This commit is contained in:
parent
9cf266ec26
commit
9a6ed554f2
14 changed files with 14 additions and 14 deletions
|
@ -31,7 +31,7 @@
|
||||||
<SkipGenerationCheck>true</SkipGenerationCheck>
|
<SkipGenerationCheck>true</SkipGenerationCheck>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<Import Condition="Exists('pkg/baseline/baseline.props') AND '$(MSBuildProjectExtension)' == '.pkgproj'" Project="pkg/baseline/baseline.props" />
|
<Import Condition="Exists('../pkg/baseline/baseline.props') AND '$(MSBuildProjectExtension)' == '.pkgproj'" Project="../pkg/baseline/baseline.props" />
|
||||||
|
|
||||||
<PropertyGroup Condition="'$(OsEnvironment)'=='Unix'">
|
<PropertyGroup Condition="'$(OsEnvironment)'=='Unix'">
|
||||||
<!--
|
<!--
|
|
@ -8,7 +8,7 @@
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<!-- Import configuration data model -->
|
<!-- Import configuration data model -->
|
||||||
<Import Project="$(ProjectDir)tools-local/properties.props" />
|
<Import Project="$(RepositoryEngineeringDir)configurations/properties.props" />
|
||||||
|
|
||||||
<!-- Runs during traversal when BuildAllConfigurations is set to expand each project
|
<!-- Runs during traversal when BuildAllConfigurations is set to expand each project
|
||||||
to a seperate instance for each of its BuildConfigurations -->
|
to a seperate instance for each of its BuildConfigurations -->
|
|
@ -152,7 +152,7 @@
|
||||||
</XmlUpdateStep>
|
</XmlUpdateStep>
|
||||||
<UpdateStep Include="CoreCLR">
|
<UpdateStep Include="CoreCLR">
|
||||||
<UpdaterType>MSBuildSdk</UpdaterType>
|
<UpdaterType>MSBuildSdk</UpdaterType>
|
||||||
<Path>$(MSBuildThisFileDirectory)global.json</Path>
|
<Path>$(MSBuildThisFileDirectory)../global.json</Path>
|
||||||
<PackageId>Microsoft.NET.Sdk.IL</PackageId>
|
<PackageId>Microsoft.NET.Sdk.IL</PackageId>
|
||||||
<MSBuildSdkName>Microsoft.NET.Sdk.IL</MSBuildSdkName>
|
<MSBuildSdkName>Microsoft.NET.Sdk.IL</MSBuildSdkName>
|
||||||
</UpdateStep>
|
</UpdateStep>
|
|
@ -27,7 +27,7 @@
|
||||||
<Message Text="%(PackageIds.Identity)" Importance="High" />
|
<Message Text="%(PackageIds.Identity)" Importance="High" />
|
||||||
</Target>
|
</Target>
|
||||||
|
|
||||||
<Import Project="buildvertical.targets" Condition="'$(ImportedBuildVerticalTargets)' != 'true'" />
|
<Import Project="$(RepositoryEngineeringDir)buildvertical.targets" Condition="'$(ImportedBuildVerticalTargets)' != 'true'" />
|
||||||
|
|
||||||
<Target Name="BuildAllProjects" DependsOnTargets="FilterProjects">
|
<Target Name="BuildAllProjects" DependsOnTargets="FilterProjects">
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
|
|
|
@ -9,11 +9,11 @@
|
||||||
|
|
||||||
<PackageReports Condition="'@(TestPackages)' == ''" Include="$(PackageReportDir)*.json" Exclude="@(ExcludePackages->'$(PackageReportDir)%(Identity).json')"/>
|
<PackageReports Condition="'@(TestPackages)' == ''" Include="$(PackageReportDir)*.json" Exclude="@(ExcludePackages->'$(PackageReportDir)%(Identity).json')"/>
|
||||||
<PackageReports Condition="'@(TestPackages)' != ''" Include="@(TestPackages->'$(PackageReportDir)%(Identity).json')" />
|
<PackageReports Condition="'@(TestPackages)' != ''" Include="@(TestPackages->'$(PackageReportDir)%(Identity).json')" />
|
||||||
|
|
||||||
<!-- support override via commandline -->
|
<!-- support override via commandline -->
|
||||||
<RuntimesToInclude Condition="'$(RuntimesToInclude)' != ''" Include="$(RuntimesToInclude)" />
|
<RuntimesToInclude Condition="'$(RuntimesToInclude)' != ''" Include="$(RuntimesToInclude)" />
|
||||||
<TargetFrameworksToInclude Condition="'$(TargetFrameworksToInclude)' != ''" Include="$(TargetFrameworksToInclude)" />
|
<TargetFrameworksToInclude Condition="'$(TargetFrameworksToInclude)' != ''" Include="$(TargetFrameworksToInclude)" />
|
||||||
|
|
||||||
<RestoreSource Include="https:%2F%2Fapi.nuget.org/v3/index.json" />
|
<RestoreSource Include="https:%2F%2Fapi.nuget.org/v3/index.json" />
|
||||||
|
|
||||||
<!-- needed for SQLClient's SNI packages -->
|
<!-- needed for SQLClient's SNI packages -->
|
||||||
|
@ -43,7 +43,7 @@
|
||||||
<TestProjectDir>$(TestDir)projects/</TestProjectDir>
|
<TestProjectDir>$(TestDir)projects/</TestProjectDir>
|
||||||
<TestPackageDir>$(BinDir)testPackages</TestPackageDir>
|
<TestPackageDir>$(BinDir)testPackages</TestPackageDir>
|
||||||
<TestDotNetPath>$(TestToolsDir)/dotnet</TestDotNetPath>
|
<TestDotNetPath>$(TestToolsDir)/dotnet</TestDotNetPath>
|
||||||
|
|
||||||
<ProjectTemplate>project.csproj.template</ProjectTemplate>
|
<ProjectTemplate>project.csproj.template</ProjectTemplate>
|
||||||
|
|
||||||
<TestRestoreCommand>$(TestDotNetPath)</TestRestoreCommand>
|
<TestRestoreCommand>$(TestDotNetPath)</TestRestoreCommand>
|
||||||
|
@ -65,10 +65,10 @@
|
||||||
<TestSupportFiles Include="$(SourceDir)shims\netfxreference.props">
|
<TestSupportFiles Include="$(SourceDir)shims\netfxreference.props">
|
||||||
<DestinationFolder>$(TestToolsDir)</DestinationFolder>
|
<DestinationFolder>$(TestToolsDir)</DestinationFolder>
|
||||||
</TestSupportFiles>
|
</TestSupportFiles>
|
||||||
<TestSupportFiles Include="$(ProjectDir)dependencies.props">
|
<TestSupportFiles Include="$(RepositoryEngineeringDir)dependencies.props">
|
||||||
<DestinationFolder>$(TestToolsDir)</DestinationFolder>
|
<DestinationFolder>$(TestToolsDir)</DestinationFolder>
|
||||||
</TestSupportFiles>
|
</TestSupportFiles>
|
||||||
<TestSupportFiles Include="$(ProjectDir)eng/versions.props">
|
<TestSupportFiles Include="$(RepositoryEngineeringDir)versions.props">
|
||||||
<DestinationFolder>$(TestToolsDir)eng/</DestinationFolder>
|
<DestinationFolder>$(TestToolsDir)eng/</DestinationFolder>
|
||||||
</TestSupportFiles>
|
</TestSupportFiles>
|
||||||
<TestSupportFiles Include="$(ToolsDir)Packaging.common.targets">
|
<TestSupportFiles Include="$(ToolsDir)Packaging.common.targets">
|
||||||
|
@ -93,7 +93,7 @@
|
||||||
<DestinationFolder>$(TestDir)</DestinationFolder>
|
<DestinationFolder>$(TestDir)</DestinationFolder>
|
||||||
</TestSupportFiles>
|
</TestSupportFiles>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<CliEnvironment Include="DOTNET_CLI_TELEMETRY_OPTOUT=1" />
|
<CliEnvironment Include="DOTNET_CLI_TELEMETRY_OPTOUT=1" />
|
||||||
<CliEnvironment Include="DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1" />
|
<CliEnvironment Include="DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1" />
|
||||||
|
@ -106,12 +106,12 @@
|
||||||
<MakeDir Directories="%(TestSupportFiles.DestinationFolder)" />
|
<MakeDir Directories="%(TestSupportFiles.DestinationFolder)" />
|
||||||
<Copy SourceFiles="@(TestSupportFiles)" DestinationFolder="%(TestSupportFiles.DestinationFolder)" />
|
<Copy SourceFiles="@(TestSupportFiles)" DestinationFolder="%(TestSupportFiles.DestinationFolder)" />
|
||||||
</Target>
|
</Target>
|
||||||
|
|
||||||
<Target Name="GetSupportedPackages">
|
<Target Name="GetSupportedPackages">
|
||||||
<GetSupportedPackagesFromPackageReports PackageReports="@(PackageReports)">
|
<GetSupportedPackagesFromPackageReports PackageReports="@(PackageReports)">
|
||||||
<Output TaskParameter="SupportedPackages" ItemName="SupportedPackage"/>
|
<Output TaskParameter="SupportedPackages" ItemName="SupportedPackage"/>
|
||||||
</GetSupportedPackagesFromPackageReports>
|
</GetSupportedPackagesFromPackageReports>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<SupportedPackage>
|
<SupportedPackage>
|
||||||
<ProjectDir>$(TestProjectDir)%(Identity)/%(TargetFrameworkShort)/</ProjectDir>
|
<ProjectDir>$(TestProjectDir)%(Identity)/%(TargetFrameworkShort)/</ProjectDir>
|
||||||
|
@ -137,7 +137,7 @@
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
</Target>
|
</Target>
|
||||||
|
|
||||||
<Target Name="UpdateRuntimeIdentifiers"
|
<Target Name="UpdateRuntimeIdentifiers"
|
||||||
AfterTargets="GetSupportedPackages"
|
AfterTargets="GetSupportedPackages"
|
||||||
Inputs="%(SupportedPackage.Identity);%(SupportedPackage.TargetFrameworkShort)"
|
Inputs="%(SupportedPackage.Identity);%(SupportedPackage.TargetFrameworkShort)"
|
||||||
Outputs="unused">
|
Outputs="unused">
|
||||||
|
@ -181,7 +181,7 @@
|
||||||
<Message Importance="High" Text="*** Restoring ***" />
|
<Message Importance="High" Text="*** Restoring ***" />
|
||||||
<Exec Command="$(TestRestoreCommand) "$(TestProject)"" EnvironmentVariables="@(CliEnvironment)" StandardOutputImportance="High" />
|
<Exec Command="$(TestRestoreCommand) "$(TestProject)"" EnvironmentVariables="@(CliEnvironment)" StandardOutputImportance="High" />
|
||||||
</Target>
|
</Target>
|
||||||
|
|
||||||
<Target Name="BuildProjects"
|
<Target Name="BuildProjects"
|
||||||
DependsOnTargets="RestoreProjects">
|
DependsOnTargets="RestoreProjects">
|
||||||
<Message Importance="High" Text="*** Testing ***" />
|
<Message Importance="High" Text="*** Testing ***" />
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue