diff options
| author | Lluis Sanchez <llsan@microsoft.com> | 2019-03-21 00:29:49 +0300 |
|---|---|---|
| committer | Lluis Sanchez <llsan@microsoft.com> | 2019-03-21 00:29:49 +0300 |
| commit | 228695e2dc646fb2ad812c06bebfe33ca9f69601 (patch) | |
| tree | 89a6f3a75447bc4a202add057b05fb67b68ac762 /main/src/addins/TextTemplating | |
| parent | 935f47982ef658566f1b1af36acdd5ca46cdb323 (diff) | |
| parent | b14cae42f57650e9de2dd31d1beab5f90a4d44ec (diff) | |
Merge remote-tracking branch 'xamarin/master-vnext' into new-service-model
Diffstat (limited to 'main/src/addins/TextTemplating')
4 files changed, 9 insertions, 27 deletions
diff --git a/main/src/addins/TextTemplating/Makefile.am b/main/src/addins/TextTemplating/Makefile.am deleted file mode 100644 index 0a3a6e73dd..0000000000 --- a/main/src/addins/TextTemplating/Makefile.am +++ /dev/null @@ -1,2 +0,0 @@ -SUBDIRS = \ - MonoDevelop.TextTemplating diff --git a/main/src/addins/TextTemplating/MonoDevelop.TextTemplating/Makefile.am b/main/src/addins/TextTemplating/MonoDevelop.TextTemplating/Makefile.am deleted file mode 100644 index c9cc87438f..0000000000 --- a/main/src/addins/TextTemplating/MonoDevelop.TextTemplating/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -include $(top_srcdir)/xbuild.include diff --git a/main/src/addins/TextTemplating/MonoDevelop.TextTemplating/MonoDevelop.TextTemplating.csproj b/main/src/addins/TextTemplating/MonoDevelop.TextTemplating/MonoDevelop.TextTemplating.csproj index a1591b8030..f4d393e913 100644 --- a/main/src/addins/TextTemplating/MonoDevelop.TextTemplating/MonoDevelop.TextTemplating.csproj +++ b/main/src/addins/TextTemplating/MonoDevelop.TextTemplating/MonoDevelop.TextTemplating.csproj @@ -7,6 +7,10 @@ <ProjectGuid>{8CCA39DD-8412-4547-BE7F-0C3D3ACC6FAC}</ProjectGuid> <TargetFrameworkVersion>$(MDFrameworkVersion)</TargetFrameworkVersion> <OutputPath>..\..\..\..\build\AddIns\MonoDevelop.TextTemplating</OutputPath> + <!-- + This needs to be ported to the new editor, and currently makes use of many deprecated APIs. + --> + <NoWarn>$(NoWarn);618;612</NoWarn> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " /> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " /> @@ -33,15 +37,7 @@ <Reference Include="System" /> <Reference Include="System.Core" /> <Reference Include="System.Xml" /> - <Reference Include="Microsoft.CodeAnalysis"> - <HintPath>..\..\..\..\build\bin\Microsoft.CodeAnalysis.dll</HintPath> - <Private>False</Private> - </Reference> - <Reference Include="Mono.TextTemplating"> - <HintPath>..\..\..\..\packages\Mono.TextTemplating.1.3.1\lib\net45\Mono.TextTemplating.dll</HintPath> - </Reference> - </ItemGroup> - <ItemGroup> + <PackageReference Include="Mono.TextTemplating" Version="1.3.1" /> </ItemGroup> <ItemGroup> <ProjectReference Include="..\..\..\core\MonoDevelop.Core\MonoDevelop.Core.csproj"> @@ -69,19 +65,12 @@ <Name>Mono.Addins</Name> <Private>False</Private> </ProjectReference> + <IncludeCopyLocal Include="Mono.TextTemplating.dll" /> </ItemGroup> <ItemGroup> - <None Include="Templates\T4TemplateCSharp.xft.xml"> - <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> - </None> - <None Include="Templates\T4PreprocessedTemplateCSharp.xft.xml"> - <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> - </None> - <None Include="packages.config" /> - <None Include="..\..\..\..\packages\Mono.TextTemplating.1.3.1\tools\TextTransform.exe"> - <Link>TextTransform.exe</Link> - <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> - </None> + <ExtensionContent Include="Templates\**\*.*" /> + <DownloadNupkg Include="Mono.TextTemplating" Version="1.3.1" /> + <ExtensionContent Include="$(DownloadNupkgDirectory)Mono.TextTemplating.1.3.1\tools\TextTransform.exe" /> </ItemGroup> <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> </Project> diff --git a/main/src/addins/TextTemplating/MonoDevelop.TextTemplating/packages.config b/main/src/addins/TextTemplating/MonoDevelop.TextTemplating/packages.config deleted file mode 100644 index 6cdb1c91af..0000000000 --- a/main/src/addins/TextTemplating/MonoDevelop.TextTemplating/packages.config +++ /dev/null @@ -1,4 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<packages> - <package id="Mono.TextTemplating" version="1.3.1" targetFramework="net45" /> -</packages> |