Skip to content

Commit e3ab734

Browse files
Apply source build patches (#8338)
* Build Microsoft.DotNet.Build.Tasks.Workloads for net6.0 * workaround for hardcoded DotNetSharedFrameworkTaskDir * don't use obsolete managed SHA256 class Co-authored-by: Michael Simons <[email protected]>
1 parent 1bb3ab3 commit e3ab734

File tree

3 files changed

+5
-1
lines changed

3 files changed

+5
-1
lines changed

src/Microsoft.DotNet.Build.Tasks.Workloads/src/Microsoft.DotNet.Build.Tasks.Workloads.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
<Project Sdk="Microsoft.NET.Sdk">
33
<PropertyGroup>
44
<TargetFrameworks>net472;netcoreapp3.1</TargetFrameworks>
5+
<TargetFrameworks Condition="'$(DotNetBuildFromSource)' == 'true'">net6.0</TargetFrameworks>
56
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
67
<LangVersion>Latest</LangVersion>
78
<IsPackable>true</IsPackable>

src/Microsoft.DotNet.Build.Tasks.Workloads/src/Utils.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ public static Guid CreateUuid(Guid namespaceUuid, string name)
122122
Buffer.BlockCopy(nameBytes, 0, hashBuffer, 16, nameBytes.Length);
123123
byte[] hash;
124124

125-
using (SHA256 sha256 = new SHA256Managed())
125+
using (SHA256 sha256 = SHA256.Create())
126126
{
127127
hash = sha256.ComputeHash(hashBuffer);
128128
}

src/Microsoft.DotNet.SharedFramework.Sdk/sdk/Sdk.props

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@
1010
<PropertyGroup Condition="'$(DotNetSharedFrameworkTaskDir)' == ''">
1111
<DotNetSharedFrameworkTaskDir Condition="'$(MSBuildRuntimeType)' == 'core'">$(MSBuildThisFileDirectory)../tools/netcoreapp3.1/</DotNetSharedFrameworkTaskDir>
1212
<DotNetSharedFrameworkTaskDir Condition="'$(MSBuildRuntimeType)' != 'core'">$(MSBuildThisFileDirectory)../tools/net472/</DotNetSharedFrameworkTaskDir>
13+
14+
<!-- Workaround for https://github.com/dotnet/arcade/issues/7413 -->
15+
<DotNetSharedFrameworkTaskDir Condition="'$(MSBuildRuntimeType)' == 'core' and '$(DotNetBuildFromSource)' == 'true'">$(MSBuildThisFileDirectory)../tools/net6.0/</DotNetSharedFrameworkTaskDir>
1316
</PropertyGroup>
1417

1518
<PropertyGroup>

0 commit comments

Comments
 (0)