diff options
| author | Mikayla Hutchinson <m.j.hutchinson@gmail.com> | 2019-01-11 12:06:57 +0300 |
|---|---|---|
| committer | Mikayla Hutchinson <m.j.hutchinson@gmail.com> | 2019-01-11 12:06:57 +0300 |
| commit | 13ff4d7a32abd268cd234cc1b84e58090ebc180e (patch) | |
| tree | 7a4213b3aeff70723b51f66830200050d85ebb40 /main/msbuild | |
| parent | 072bd1411a534d21258fabe0992c7813f43ae24f (diff) | |
Fix custom build tasks
Diffstat (limited to 'main/msbuild')
| -rw-r--r-- | main/msbuild/MDBuildTasks.targets | 6 | ||||
| -rw-r--r-- | main/msbuild/MDBuildTasks/DownloadNupkg.cs | 2 | ||||
| -rw-r--r-- | main/msbuild/MDBuildTasks/MDBuildTasks.csproj | 8 |
3 files changed, 8 insertions, 8 deletions
diff --git a/main/msbuild/MDBuildTasks.targets b/main/msbuild/MDBuildTasks.targets index 6e6170cf4a..00a86aab6f 100644 --- a/main/msbuild/MDBuildTasks.targets +++ b/main/msbuild/MDBuildTasks.targets @@ -109,11 +109,11 @@ </ItemGroup> <ItemGroup> <ExtensionContent - Include="@(DownloadedNupkg->HasMetadata('ExtensionPath'))" - Link="$([MSBuild]::EnsureTrailingSlash('%(ExtensionPath)'))%(Filename)%(Extension)" /> + Include="@(DownloadedNupkg->HasMetadata('ExtensionDir'))" + Link="$([MSBuild]::EnsureTrailingSlash('%(DownloadedNupkg.ExtensionDir)'))%(Filename)%(Extension)" /> <ExtensionContent Include="@(DownloadedNupkg->HasMetadata('ExtensionPath'))" - Link="%(ExtensionPath)" /> + Link="%(DownloadedNupkg.ExtensionPath)" /> </ItemGroup> </Target> diff --git a/main/msbuild/MDBuildTasks/DownloadNupkg.cs b/main/msbuild/MDBuildTasks/DownloadNupkg.cs index 3c318b135b..2b9e2e1310 100644 --- a/main/msbuild/MDBuildTasks/DownloadNupkg.cs +++ b/main/msbuild/MDBuildTasks/DownloadNupkg.cs @@ -26,7 +26,7 @@ using System.Text; namespace MDBuildTasks { - public class MDDownloadNupkg : ToolTask + public class DownloadNupkg : ToolTask { [Required] public ITaskItem[] Packages { get; set; } diff --git a/main/msbuild/MDBuildTasks/MDBuildTasks.csproj b/main/msbuild/MDBuildTasks/MDBuildTasks.csproj index 273c3c92f9..158a8ed0c7 100644 --- a/main/msbuild/MDBuildTasks/MDBuildTasks.csproj +++ b/main/msbuild/MDBuildTasks/MDBuildTasks.csproj @@ -7,7 +7,7 @@ <OutputType>Library</OutputType> <RootNamespace>MDBuildTasks</RootNamespace> <AssemblyName>MDBuildTasks</AssemblyName> - <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion> + <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion> <RestoreProjectStyle>PackageReference</RestoreProjectStyle> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> @@ -29,13 +29,13 @@ </PropertyGroup> <ItemGroup> <Reference Include="System" /> - <Reference Include="$(MSBuildBinPath)\Microsoft.Build.Tasks.Core.dll" /> - <Reference Include="$(MSBuildBinPath)\Microsoft.Build.Utilities.Core.dll" /> - <Reference Include="$(MSBuildBinPath)\Microsoft.Build.Framework.dll" /> <Reference Include="System.IO.Compression.FileSystem" /> <Reference Include="System.IO.Compression" /> <Reference Include="System.Xml.Linq" /> <Reference Include="System.Xml" /> + <PackageReference Include="Microsoft.Build.Framework" Version="15.9.20" /> + <PackageReference Include="Microsoft.Build.Utilities.Core" Version="15.9.20" /> + <PackageReference Include="Microsoft.Build.Tasks.Core" Version="15.9.20" /> </ItemGroup> <ItemGroup> <Compile Include="Properties\AssemblyInfo.cs" /> |