Skip to content

Commit 8f4a552

Browse files
committed
Merge 'release/2.1' into merge/release/2.1-to-release/2.2
Ignore submodule and ProdCon updates: 2.2 is newer. The dotnet/standard submodule update to 2.0.3 is applicable to the 2.2 branch at this point in time, but another PR will update it to an even newer version so the change is being excluded here.
2 parents a901207 + 5d43325 commit 8f4a552

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

dir.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
<ToolPackageExtractDir>$(ToolsDir)source-built/</ToolPackageExtractDir>
4747
<ToolsLocalDir>$(ProjectDir)tools-local/</ToolsLocalDir>
4848
<TaskDirectory>$(ToolsLocalDir)tasks/</TaskDirectory>
49-
<TasksBinDir>$(TaskDirectory)Microsoft.DotNet.SourceBuild.Tasks/bin/Debug/netstandard2.0/</TasksBinDir>
49+
<TasksBinDir>$(TaskDirectory)Microsoft.DotNet.SourceBuild.Tasks/bin/Debug/netstandard1.5/</TasksBinDir>
5050
<BaseIntermediatePath>$(BaseOutputPath)obj/</BaseIntermediatePath>
5151
<OutputPath>$(BaseOutputPath)$(Platform)/$(Configuration)/</OutputPath>
5252
<IntermediatePath>$(BaseIntermediatePath)$(Platform)/$(Configuration)/</IntermediatePath>

tools-local/tasks/Microsoft.DotNet.SourceBuild.Tasks/Microsoft.DotNet.SourceBuild.Tasks.csproj

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
</PropertyGroup>
66
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))/dir.props" />
77
<PropertyGroup>
8-
<TargetFramework>netstandard2.0</TargetFramework>
8+
<TargetFramework>netstandard1.5</TargetFramework>
99
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
1010
<CoreSetupPlatformAbstractionsPath>$(SubmoduleDirectory)core-setup/src/managed/Microsoft.DotNet.PlatformAbstractions/</CoreSetupPlatformAbstractionsPath>
1111
<OutputPath>$(MSBuildThisFileDirectory)bin/$(Configuration)</OutputPath>
@@ -27,6 +27,9 @@
2727
<PackageReference Include="Microsoft.Build.Utilities.Core">
2828
<Version>15.6.82</Version>
2929
</PackageReference>
30+
<PackageReference Include="System.ValueTuple">
31+
<Version>4.4.0</Version>
32+
</PackageReference>
3033
</ItemGroup>
3134

3235
<!--

0 commit comments

Comments
 (0)