Skip to content
This repository was archived by the owner on Nov 6, 2018. It is now read-only.

Commit bf9223e

Browse files
committed
Update tasks for netstandard2.0
The 15.8 version of MSBuild dropped support for netstandard1.5
1 parent 3cc768b commit bf9223e

File tree

5 files changed

+11
-11
lines changed

5 files changed

+11
-11
lines changed

Diff for: build/dependencies.props

+4-4
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
<PropertyGroup Label="Package Versions">
66
<InternalAspNetCoreSdkPackageVersion>3.0.0-alpha1-20181004.7</InternalAspNetCoreSdkPackageVersion>
77
<MicrosoftAspNetCoreTestingPackageVersion>3.0.0-alpha1-10584</MicrosoftAspNetCoreTestingPackageVersion>
8-
<MicrosoftBuildFrameworkPackageVersion>15.6.82</MicrosoftBuildFrameworkPackageVersion>
9-
<MicrosoftBuildPackageVersion>15.6.82</MicrosoftBuildPackageVersion>
10-
<MicrosoftBuildTasksCorePackageVersion>15.6.82</MicrosoftBuildTasksCorePackageVersion>
11-
<MicrosoftBuildUtilitiesCorePackageVersion>15.6.82</MicrosoftBuildUtilitiesCorePackageVersion>
8+
<MicrosoftBuildFrameworkPackageVersion>15.8.166</MicrosoftBuildFrameworkPackageVersion>
9+
<MicrosoftBuildPackageVersion>15.8.166</MicrosoftBuildPackageVersion>
10+
<MicrosoftBuildTasksCorePackageVersion>15.8.166</MicrosoftBuildTasksCorePackageVersion>
11+
<MicrosoftBuildUtilitiesCorePackageVersion>15.8.166</MicrosoftBuildUtilitiesCorePackageVersion>
1212
<MicrosoftExtensionsHashCodeCombinerSourcesPackageVersion>3.0.0-alpha1-10584</MicrosoftExtensionsHashCodeCombinerSourcesPackageVersion>
1313
<MicrosoftExtensionsNonCapturingTimerSourcesPackageVersion>3.0.0-alpha1-10584</MicrosoftExtensionsNonCapturingTimerSourcesPackageVersion>
1414
<MicrosoftExtensionsPrimitivesPackageVersion>3.0.0-alpha1-10584</MicrosoftExtensionsPrimitivesPackageVersion>

Diff for: src/FS.Embedded.Manifest.Task/FS.Embedded.Manifest.Task.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<AssemblyName>Microsoft.Extensions.FileProviders.Embedded.Manifest.Task</AssemblyName>
66
<Description>MSBuild task to generate a manifest that can be used by Microsoft.Extensions.FileProviders.Embedded to preserve
77
metadata of the files embedded in the assembly at compilation time.</Description>
8-
<TargetFrameworks>netstandard1.5;net461</TargetFrameworks>
8+
<TargetFrameworks>netstandard2.0;net461</TargetFrameworks>
99
<GenerateDocumentationFile>false</GenerateDocumentationFile>
1010
<EnableApiCheck>false</EnableApiCheck>
1111
<IsPackable>false</IsPackable>

Diff for: src/FS.Embedded/FS.Embedded.csproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
<ItemGroup>
2121
<SignedPackageFile Include="$(TargetPath)" PackagePath="lib/$(TargetFramework)/$(TargetFileName)" Certificate="$(AssemblySigningCertName)" />
22-
<SignedPackageFile Include="$(MSBuildThisFileDirectory)..\FS.Embedded.Manifest.Task\bin\$(Configuration)\netstandard1.5\$(AssemblyName).Manifest.Task.dll" PackagePath="tasks/netstandard1.5/Microsoft.Extensions.FileProviders.Embedded.Manifest.Task.dll" Certificate="$(AssemblySigningCertName)" />
22+
<SignedPackageFile Include="$(MSBuildThisFileDirectory)..\FS.Embedded.Manifest.Task\bin\$(Configuration)\netstandard2.0\$(AssemblyName).Manifest.Task.dll" PackagePath="tasks/netstandard2.0/Microsoft.Extensions.FileProviders.Embedded.Manifest.Task.dll" Certificate="$(AssemblySigningCertName)" />
2323
<SignedPackageFile Include="$(MSBuildThisFileDirectory)..\FS.Embedded.Manifest.Task\bin\$(Configuration)\net461\$(AssemblyName).Manifest.Task.dll" PackagePath="tasks/net461/Microsoft.Extensions.FileProviders.Embedded.Manifest.Task.dll" Certificate="$(AssemblySigningCertName)" />
2424
</ItemGroup>
2525

@@ -49,8 +49,8 @@
4949
OutputDocumentation=@(DocumentationProjectOutputGroupOutput);
5050

5151
<!-- Include the assembly and symbols from the tasks project -->
52-
TaskAssemblyNetStandard=..\FS.Embedded.Manifest.Task\bin\$(Configuration)\netstandard1.5\$(AssemblyName).Manifest.Task.dll;
53-
TaskSymbolNetStandard=..\FS.Embedded.Manifest.Task\bin\$(Configuration)\netstandard1.5\$(AssemblyName).Manifest.Task.pdb;
52+
TaskAssemblyNetStandard=..\FS.Embedded.Manifest.Task\bin\$(Configuration)\netstandard2.0\$(AssemblyName).Manifest.Task.dll;
53+
TaskSymbolNetStandard=..\FS.Embedded.Manifest.Task\bin\$(Configuration)\netstandard2.0\$(AssemblyName).Manifest.Task.pdb;
5454
TaskAssemblyNet461=..\FS.Embedded.Manifest.Task\bin\$(Configuration)\net461\$(AssemblyName).Manifest.Task.dll;
5555
TaskSymbolNet461=..\FS.Embedded.Manifest.Task\bin\$(Configuration)\net461\$(AssemblyName).Manifest.Task.pdb;
5656
</NuspecProperties>

Diff for: src/FS.Embedded/FS.Embedded.nuspec

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@
2525
<file src="$OutputDocumentation$" target="lib\$targetframework$\" />
2626
<file src="build\**\*" target="build\" />
2727
<file src="buildMultiTargeting\**\*" target="buildMultiTargeting\" />
28-
<file src="$TaskAssemblyNetStandard$" target="tasks\netstandard1.5\$AssemblyName$.Manifest.Task.dll" />
29-
<file src="$TaskSymbolNetStandard$" target="tasks\netstandard1.5\$AssemblyName$.Manifest.Task.pdb" />
28+
<file src="$TaskAssemblyNetStandard$" target="tasks\netstandard2.0\$AssemblyName$.Manifest.Task.dll" />
29+
<file src="$TaskSymbolNetStandard$" target="tasks\netstandard2.0\$AssemblyName$.Manifest.Task.pdb" />
3030
<file src="$TaskAssemblyNet461$" target="tasks\net461\$AssemblyName$.Manifest.Task.dll" />
3131
<file src="$TaskSymbolNet461$" target="tasks\net461\$AssemblyName$.Manifest.Task.pdb" />
3232
</files>

Diff for: src/FS.Embedded/build/netstandard2.0/Microsoft.Extensions.FileProviders.Embedded.props

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
</PropertyGroup>
66

77
<PropertyGroup>
8-
<_FileProviderTaskFolder Condition="'$(MSBuildRuntimeType)' == 'Core'">netstandard1.5</_FileProviderTaskFolder>
8+
<_FileProviderTaskFolder Condition="'$(MSBuildRuntimeType)' == 'Core'">netstandard2.0</_FileProviderTaskFolder>
99
<_FileProviderTaskFolder Condition="'$(MSBuildRuntimeType)' != 'Core'">net461</_FileProviderTaskFolder>
1010
<_FileProviderTaskAssembly>$(MSBuildThisFileDirectory)..\..\tasks\$(_FileProviderTaskFolder)\Microsoft.Extensions.FileProviders.Embedded.Manifest.Task.dll</_FileProviderTaskAssembly>
1111
</PropertyGroup>

0 commit comments

Comments
 (0)