Skip to content
This repository was archived by the owner on Apr 20, 2023. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions Directory.Build.targets
Original file line number Diff line number Diff line change
@@ -1,4 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<Project>
<Import Project="Sdk.targets" Sdk="Microsoft.DotNet.Arcade.Sdk" />

<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp'
and $(MicrosoftNETCoreAppPackageVersion.StartsWith('$(_TargetFrameworkVersionWithoutV)'))">
<FrameworkReference
Update="Microsoft.NETCore.App"
TargetingPackVersion="$(MicrosoftNETCoreAppPackageVersion)"
RuntimeFrameworkVersion="$(MicrosoftNETCoreAppPackageVersion)" />
</ItemGroup>
</Project>
6 changes: 3 additions & 3 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<Dependencies>
<ProductDependencies>
<Dependency Name="Microsoft.NETCore.App" Version="3.0.0-preview7-27826-04">
<Dependency Name="Microsoft.NETCore.App" Version="3.0.0-preview7-27826-20">
<Uri>https://github.com/dotnet/core-setup</Uri>
<Sha>5c4d829254f40bca8a85ee11f03b2d90d71aa847</Sha>
<Sha>ee0c7ead1a46f06f98aff9102b785f532b71da9c</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Cli.Runtime" Version="3.0.100-preview7.19326.4">
<Dependency Name="Microsoft.DotNet.Cli.Runtime" Version="3.0.100-preview7.19326.4" CoherentParentDependency="Microsoft.NETCore.App">
<Uri>https://github.com/dotnet/cli</Uri>
<Sha>0c7a6caea739553ceeb94b2e0d05c4354c79c8fe</Sha>
</Dependency>
Expand Down
4 changes: 4 additions & 0 deletions eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,10 @@
<SystemTextEncodingCodePagesPackageVersion>4.6.0-preview7.19326.2</SystemTextEncodingCodePagesPackageVersion>
<SystemSecurityCryptographyProtectedDataPackageVersion>4.6.0-preview7.19326.2</SystemSecurityCryptographyProtectedDataPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/core-setup -->
<MicrosoftNETCoreAppPackageVersion>3.0.0-preview7-27826-20</MicrosoftNETCoreAppPackageVersion>
</PropertyGroup>
<PropertyGroup>
<MicrosoftDotNetPlatformAbstractionsPackageVersion>2.2.0-preview1-26620-03</MicrosoftDotNetPlatformAbstractionsPackageVersion>
<MicrosoftDotNetCliUtilsPackageVersion>2.2.100-refac-20180613-1</MicrosoftDotNetCliUtilsPackageVersion>
Expand Down
7 changes: 6 additions & 1 deletion global.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
{
"tools": {
"dotnet": "3.0.100-preview5-011568"
"dotnet": "3.0.100-preview5-011568",
"runtimes": {
"dotnet": [
"$(MicrosoftNETCoreAppPackageVersion)"
]
}
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19326.2"
Expand Down
2 changes: 1 addition & 1 deletion src/redist/targets/GenerateLayout.targets
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@
AfterTargets="Build">
<PropertyGroup>
<ReplacementPattern>"version": ".*"</ReplacementPattern>
<ReplacementString>"version": "$(BundledNETCoreAppPackageVersion)"</ReplacementString>
<ReplacementString>"version": "$(MicrosoftNETCoreAppPackageVersion)"</ReplacementString>
</PropertyGroup>
<ItemGroup>
<ToolRuntimeConfigPath Include="$(OutputPath)/**/*.runtimeconfig.json" />
Expand Down