-
Notifications
You must be signed in to change notification settings - Fork 4.7k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Update dotnet SDK to 6.0 Preview 4 (#53808)
* Update dotnet SDK to 6.0 Preview 4 Update the minimum and target version of the SDK to 6.0 Preview 4. Part of #53411 * Switch to using eng/targetingpacks.targets for redirecting runtime pack location in src/mono/sample * Fix binder tracing tests * Set UseMonoRuntime property so the dotnet SDK can pull the mono runtime packs This is necessary after the changes from dotnet/sdk#16909. * Move UseMonoRuntimeProperty and set it to false in coreclr Co-authored-by: Alexander Köplinger <alex.koeplinger@outlook.com> Co-authored-by: Elinor Fung <elfung@microsoft.com>
- Loading branch information
1 parent
6afe03e
commit 8698d0f
Showing
16 changed files
with
46 additions
and
96 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,8 @@ | ||
<Project> | ||
<Import Project="$(RepositoryEngineeringDir)targetingpacks.targets" /> | ||
<Import Project="..\Directory.Build.targets"/> | ||
|
||
<Target Name="PrintRuntimePackLocation" AfterTargets="UpdateTargetingAndRuntimePack"> | ||
<Message Text="Used runtime pack: %(ResolvedRuntimePack.PackageDirectory)" Importance="high" /> | ||
</Target> | ||
</Project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,5 @@ | ||
<Project Sdk="Microsoft.NET.Sdk"> | ||
<PropertyGroup> | ||
<TargetFramework>$(NetCoreAppToolCurrent)</TargetFramework> | ||
<EnableTargetingPackDownload>false</EnableTargetingPackDownload> | ||
</PropertyGroup> | ||
</Project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,33 +1,15 @@ | ||
<?xml version="1.0" encoding="utf-8"?> | ||
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | ||
<Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props))" /> | ||
<ItemGroup> | ||
<PackageReference Include="Microsoft.DotNet.xunit.performance.run.core"> | ||
<Version>1.0.0-alpha-build0040</Version> | ||
</PackageReference> | ||
<PackageReference Include="Microsoft.DotNet.xunit.performance.analysis.cli"> | ||
<Version>1.0.0-alpha-build0040</Version> | ||
</PackageReference> | ||
<PackageReference Include="Microsoft.DotNet.xunit.performance.runner.cli"> | ||
<Version>1.0.0-alpha-build0040</Version> | ||
</PackageReference> | ||
<PackageReference Include="Microsoft.DotNet.xunit.performance"> | ||
<Version>1.0.0-alpha-build0040</Version> | ||
</PackageReference> | ||
<PackageReference Include="Microsoft.DotNet.XUnitConsoleRunner"> | ||
<Version>$(MicrosoftDotNetXUnitConsoleRunnerVersion)</Version> | ||
</PackageReference> | ||
<PackageReference Include="Microsoft.DotNet.BuildTools.TestSuite"> | ||
<Version>1.0.0-prerelease-00629-04</Version> | ||
</PackageReference> | ||
</ItemGroup> | ||
<Project Sdk="Microsoft.Build.NoTargets"> | ||
<PropertyGroup> | ||
<TargetFramework>netstandard1.3</TargetFramework> | ||
<TargetFrameworkIdentifier>.NETStandard</TargetFrameworkIdentifier> | ||
<RuntimeIdentifiers>win7-x86;win7-x64</RuntimeIdentifiers> | ||
<IsTestProject>false</IsTestProject> | ||
</PropertyGroup> | ||
<Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.targets))" /> | ||
<Target Name="Build" | ||
DependsOnTargets="ResolveReferences" /> | ||
<ItemGroup> | ||
<!--<PackageReference Include="Microsoft.DotNet.xunit.performance.run.core" Version="1.0.0-alpha-build0040" /> | ||
<PackageReference Include="Microsoft.DotNet.xunit.performance.analysis.cli" Version="1.0.0-alpha-build0040" /> | ||
<PackageReference Include="Microsoft.DotNet.xunit.performance.runner.cli" Version="1.0.0-alpha-build0040" /> | ||
<PackageReference Include="Microsoft.DotNet.xunit.performance" Version="1.0.0-alpha-build0040" /> | ||
<PackageReference Include="Microsoft.DotNet.XUnitConsoleRunner" Version="$(MicrosoftDotNetXUnitConsoleRunnerVersion)" /> | ||
<PackageReference Include="Microsoft.DotNet.BuildTools.TestSuite" Version="1.0.0-prerelease-00629-04" />--> | ||
</ItemGroup> | ||
</Project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters