diff options
author | Mikayla Hutchinson <m.j.hutchinson@gmail.com> | 2019-01-09 09:41:44 +0300 |
---|---|---|
committer | Mikayla Hutchinson <m.j.hutchinson@gmail.com> | 2019-01-11 04:42:16 +0300 |
commit | 3b95431162ee36d23634ddbc7cf2df91db4b438f (patch) | |
tree | 96e26e54f646b0133947dc8ba53fb43a2239ecc2 /main | |
parent | a5ee225ef5f0344459bf65e808c3b17e7fe6db7a (diff) |
Partially switch remaining projects to csproj
These all have some kind of custom NuGet asset copying step
that will require additional logic.
Diffstat (limited to 'main')
17 files changed, 8 insertions, 222 deletions
diff --git a/main/Directory.Build.props b/main/Directory.Build.props index 43d6d739f6..d54fe3f6da 100644 --- a/main/Directory.Build.props +++ b/main/Directory.Build.props @@ -10,7 +10,7 @@ <NuGetVersionCecil>0.10.1</NuGetVersionCecil> <NuGetVersionErrorProneNetStructs>0.1.2</NuGetVersionErrorProneNetStructs> <NuGetVersionMicrosoftTemplateEngine>1.0.0-beta3-20171117-314</NuGetVersionMicrosoftTemplateEngine> - <NuGetVersionMicrosoftTestPlatform>16.0.0-preview-20181205-02</NuGetVersionMicrosoftTestPlatform> + <NuGetVersionMicrosoftTestPlatform>15.5.0-preview-20170919-04</NuGetVersionMicrosoftTestPlatform> <NuGetVersionMonoDevelopAnalyzers>0.1.0.1</NuGetVersionMonoDevelopAnalyzers> <NuGetVersionNewtonsoftJson>10.0.3</NuGetVersionNewtonsoftJson> <NuGetVersionNUnit2>2.7.0</NuGetVersionNUnit2> diff --git a/main/src/addins/AspNet/MonoDevelop.AspNet.csproj b/main/src/addins/AspNet/MonoDevelop.AspNet.csproj index f02df7db0f..ebb10ead5c 100644 --- a/main/src/addins/AspNet/MonoDevelop.AspNet.csproj +++ b/main/src/addins/AspNet/MonoDevelop.AspNet.csproj @@ -68,51 +68,11 @@ <Name>MonoDevelop.Xml</Name> <Private>False</Private> </ProjectReference> - <Reference Include="Microsoft.Web.Infrastructure"> - <HintPath>..\..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath> - </Reference> - <Reference Include="System.Web.Razor"> - <HintPath>..\..\..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll</HintPath> - <Private>False</Private> - </Reference> - <Reference Include="System.Web.Helpers"> - <HintPath>..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll</HintPath> - <Private>False</Private> - </Reference> - <Reference Include="System.Web.WebPages.Deployment"> - <HintPath>..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll</HintPath> - <Private>False</Private> - </Reference> - <Reference Include="System.Web.WebPages"> - <HintPath>..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll</HintPath> - <Private>False</Private> - </Reference> - <Reference Include="System.Web.WebPages.Razor"> - <HintPath>..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll</HintPath> - <Private>False</Private> - </Reference> - <Reference Include="System.Web.Mvc"> - <HintPath>..\..\..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll</HintPath> - <Private>False</Private> - </Reference> - <Reference Include="System.Web.Mvc" Condition="!Exists('$(SolutionDir)\..\.git')" /> <ProjectReference Include="..\..\..\external\nrefactory\ICSharpCode.NRefactory\ICSharpCode.NRefactory.csproj"> <Project>{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}</Project> <Name>ICSharpCode.NRefactory</Name> <Private>False</Private> </ProjectReference> - <Reference Include="System.Reflection.Metadata"> - <HintPath>..\..\..\build\bin\System.Reflection.Metadata.dll</HintPath> - <Private>False</Private> - </Reference> - <Reference Include="System.Collections.Immutable"> - <HintPath>..\..\..\build\bin\System.Collections.Immutable.dll</HintPath> - <Private>False</Private> - </Reference> - <Reference Include="Mono.TextTemplating"> - <HintPath>..\..\..\packages\Mono.TextTemplating.1.3.1\lib\net45\Mono.TextTemplating.dll</HintPath> - <Private>False</Private> - </Reference> </ItemGroup> <ItemGroup> <Reference Include="System" /> @@ -126,6 +86,7 @@ <Reference Include="System.Xml.Linq" /> <Reference Include="System.ServiceModel" /> <Reference Include="System.Runtime.Serialization" /> + <PackageReference Include="Microsoft.AspNet.Mvc" version="5.2.7" PrivateAssets="runtime" /> </ItemGroup> <ItemGroup> <EmbeddedResource Include="Properties\MonoDevelop.AspNet.addin.xml" /> @@ -420,7 +381,6 @@ <Link>Microsoft.Web.Infrastructure.dll</Link> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> </None> - <None Include="packages.config" /> <None Include="Templates\Projects\MvcProject.xpt.xml"> <SubType>Designer</SubType> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> diff --git a/main/src/addins/AspNet/packages.config b/main/src/addins/AspNet/packages.config deleted file mode 100644 index a3f69291e3..0000000000 --- a/main/src/addins/AspNet/packages.config +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<packages> - <package id="Microsoft.AspNet.Mvc" version="5.2.3" targetFramework="net45" /> - <package id="Microsoft.AspNet.Razor" version="3.2.3" targetFramework="net45" /> - <package id="Microsoft.AspNet.WebPages" version="3.2.3" targetFramework="net45" /> - <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net45" /> - <package id="Mono.TextTemplating" version="1.3.1" targetFramework="net45" /> -</packages> diff --git a/main/src/addins/MonoDevelop.AspNetCore/MonoDevelop.AspNetCore.csproj b/main/src/addins/MonoDevelop.AspNetCore/MonoDevelop.AspNetCore.csproj index b0ed8daa80..405ac9d38d 100644 --- a/main/src/addins/MonoDevelop.AspNetCore/MonoDevelop.AspNetCore.csproj +++ b/main/src/addins/MonoDevelop.AspNetCore/MonoDevelop.AspNetCore.csproj @@ -15,10 +15,6 @@ <ItemGroup> <Reference Include="System" /> <Reference Include="System.Xml" /> - <Reference Include="Newtonsoft.Json"> - <HintPath>..\..\..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath> - <Private>False</Private> - </Reference> </ItemGroup> <ItemGroup> <Compile Include="MonoDevelop.AspNetCore.Templating\AspNetCoreFileTemplateCondition.cs" /> @@ -114,7 +110,6 @@ <None Include="Templates\WebApiControllerTemplate.cs"> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> </None> - <None Include="packages.config" /> <None Include="Templates\AppSettingsFile.xft.xml"> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> </None> @@ -152,10 +147,6 @@ <ItemGroup> <InternalsVisibleTo Include="DotNetCore.Debugger" /> </ItemGroup> - <ItemGroup> - <Folder Include="MonoDevelop.AspNetCore.Commands\" /> - <Folder Include="MonoDevelop.AspNetCore.Dialogs\" /> - </ItemGroup> <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> <Target Name="BeforeBuild"> <ItemGroup> @@ -168,4 +159,4 @@ </ItemGroup> <Copy SourceFiles="..\..\..\packages\%(NuGetPackage.Identity).%(NuGetPackage.Version)\%(NuGetPackage.Identity).%(NuGetPackage.Version).nupkg" DestinationFolder="$(OutputPath)\Templates" SkipUnchangedFiles="true" /> </Target> -</Project>
\ No newline at end of file +</Project> diff --git a/main/src/addins/MonoDevelop.AspNetCore/packages.config b/main/src/addins/MonoDevelop.AspNetCore/packages.config deleted file mode 100644 index 6d3bab5899..0000000000 --- a/main/src/addins/MonoDevelop.AspNetCore/packages.config +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<packages> - <package id="Newtonsoft.Json" version="10.0.3" targetFramework="net461" /> - <package id="Microsoft.DotNet.Web.ProjectTemplates.1.x" version="1.0.0-beta2-20170430-208" targetFramework="net46" /> - <package id="Microsoft.DotNet.Web.ProjectTemplates.2.0" version="1.0.0-beta2-20170727-301" targetFramework="net46" /> -</packages>
\ No newline at end of file diff --git a/main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore.csproj b/main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore.csproj index 6f0de3c1c1..784bf34389 100644 --- a/main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore.csproj +++ b/main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore.csproj @@ -15,20 +15,8 @@ <ItemGroup> <Reference Include="System" /> <Reference Include="System.Xml" /> - <Reference Include="System.Collections.Immutable"> - <HintPath>..\..\..\build\bin\System.Collections.Immutable.dll</HintPath> - <Private>False</Private> - </Reference> - <Reference Include="Newtonsoft.Json"> - <HintPath>..\..\..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath> - <Private>False</Private> - </Reference> <Reference Include="Microsoft.CSharp" /> <Reference Include="System.Runtime.Serialization" /> - <Reference Include="NuGet.Versioning"> - <HintPath>..\..\..\packages\NuGet.Versioning.4.8.0\lib\net46\NuGet.Versioning.dll</HintPath> - <Private>False</Private> - </Reference> </ItemGroup> <ItemGroup> <Compile Include="Properties\AssemblyInfo.cs" /> diff --git a/main/src/addins/MonoDevelop.DotNetCore/packages.config b/main/src/addins/MonoDevelop.DotNetCore/packages.config deleted file mode 100644 index b2b17a922b..0000000000 --- a/main/src/addins/MonoDevelop.DotNetCore/packages.config +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<packages> - <package id="Microsoft.DotNet.Common.ProjectTemplates.1.x" version="1.0.0-beta2-20170430-208" targetFramework="net46" /> - <package id="Microsoft.DotNet.Common.ProjectTemplates.2.0" version="1.0.0-beta2-20170727-301" targetFramework="net46" /> - <package id="Microsoft.DotNet.Test.ProjectTemplates.1.x" version="1.0.0-beta2-20170430-208" targetFramework="net46" /> - <package id="Microsoft.DotNet.Test.ProjectTemplates.2.0" version="1.0.0-beta2-20170727-301" targetFramework="net46" /> - <package id="Newtonsoft.Json" version="10.0.3" targetFramework="net46" /> -</packages>
\ No newline at end of file diff --git a/main/src/addins/MonoDevelop.UnitTesting.NUnit/NUnitRunner/NUnitRunner.csproj b/main/src/addins/MonoDevelop.UnitTesting.NUnit/NUnitRunner/NUnitRunner.csproj index 313e369fc1..ebc9fc12ae 100644 --- a/main/src/addins/MonoDevelop.UnitTesting.NUnit/NUnitRunner/NUnitRunner.csproj +++ b/main/src/addins/MonoDevelop.UnitTesting.NUnit/NUnitRunner/NUnitRunner.csproj @@ -13,22 +13,8 @@ <ItemGroup> <Reference Include="System" /> <Reference Include="System.Xml" /> - <Reference Include="nunit.framework"> - <HintPath>..\..\..\..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath> - </Reference> - <Reference Include="nunit.core"> - <HintPath>..\..\..\..\packages\NUnit.Runners.2.6.4\tools\lib\nunit.core.dll</HintPath> - </Reference> - <Reference Include="nunit.core.interfaces"> - <HintPath>..\..\..\..\packages\NUnit.Runners.2.6.4\tools\lib\nunit.core.interfaces.dll</HintPath> - </Reference> - <Reference Include="nunit.util"> - <HintPath>..\..\..\..\packages\NUnit.Runners.2.6.4\tools\lib\nunit.util.dll</HintPath> - </Reference> - <Reference Include="System.ValueTuple"> - <HintPath>..\..\..\..\packages\System.ValueTuple.4.4.0\lib\net47\System.ValueTuple.dll</HintPath> - <Private>False</Private> - </Reference> + <PackageReference Include="NUnit" Version="$(NuGetVersionNUnit2)" PrivateAssets="runtime" /> + <PackageReference Include="NUnitV2.Core" Version="$(NuGetVersionNUnit2)" PrivateAssets="runtime" /> </ItemGroup> <ItemGroup> <Compile Include="NUnitTestRunner.cs" /> @@ -44,8 +30,5 @@ <Link>RemoteTestResult.cs</Link> </Compile> </ItemGroup> - <ItemGroup> - <None Include="packages.config" /> - </ItemGroup> <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> </Project> diff --git a/main/src/addins/MonoDevelop.UnitTesting.NUnit/NUnitRunner/packages.config b/main/src/addins/MonoDevelop.UnitTesting.NUnit/NUnitRunner/packages.config deleted file mode 100644 index 78668f5172..0000000000 --- a/main/src/addins/MonoDevelop.UnitTesting.NUnit/NUnitRunner/packages.config +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<packages> - <package id="NUnit" version="2.6.4" targetFramework="net40" /> - <package id="NUnit.Runners" version="2.6.4" targetFramework="net40" /> - <package id="System.ValueTuple" version="4.4.0" targetFramework="net471" /> -</packages> diff --git a/main/src/addins/MonoDevelop.UnitTesting/MonoDevelop.UnitTesting.Tests/MonoDevelop.UnitTesting.Tests.csproj b/main/src/addins/MonoDevelop.UnitTesting/MonoDevelop.UnitTesting.Tests/MonoDevelop.UnitTesting.Tests.csproj index 038b342b64..22b751215f 100644 --- a/main/src/addins/MonoDevelop.UnitTesting/MonoDevelop.UnitTesting.Tests/MonoDevelop.UnitTesting.Tests.csproj +++ b/main/src/addins/MonoDevelop.UnitTesting/MonoDevelop.UnitTesting.Tests/MonoDevelop.UnitTesting.Tests.csproj @@ -14,30 +14,12 @@ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " /> <ItemGroup> <Reference Include="System" /> - <Reference Include="System.Runtime.InteropServices.RuntimeInformation"> - <HintPath>..\..\..\..\packages\System.Runtime.InteropServices.RuntimeInformation.4.3.0\lib\net45\System.Runtime.InteropServices.RuntimeInformation.dll</HintPath> - </Reference> - <Reference Include="Microsoft.TestPlatform.CoreUtilities"> - <HintPath>..\..\..\..\packages\Microsoft.TestPlatform.ObjectModel.15.5.0-preview-20170919-04\lib\net451\Microsoft.TestPlatform.CoreUtilities.dll</HintPath> - </Reference> - <Reference Include="Microsoft.TestPlatform.PlatformAbstractions"> - <HintPath>..\..\..\..\packages\Microsoft.TestPlatform.ObjectModel.15.5.0-preview-20170919-04\lib\net451\Microsoft.TestPlatform.PlatformAbstractions.dll</HintPath> - </Reference> - <Reference Include="Microsoft.VisualStudio.TestPlatform.ObjectModel"> - <HintPath>..\..\..\..\packages\Microsoft.TestPlatform.ObjectModel.15.5.0-preview-20170919-04\lib\net451\Microsoft.VisualStudio.TestPlatform.ObjectModel.dll</HintPath> - </Reference> <Reference Include="Microsoft.CSharp" /> <Reference Include="System.Configuration" /> <Reference Include="System.Core" /> <Reference Include="System.Runtime" /> <Reference Include="System.Runtime.Serialization" /> <Reference Include="System.Xml" /> - <Reference Include="System.Collections.Immutable"> - <HintPath>..\..\..\..\packages\System.Collections.Immutable.1.5.0\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath> - </Reference> - <Reference Include="System.Reflection.Metadata"> - <HintPath>..\..\..\..\packages\System.Reflection.Metadata.1.6.0\lib\portable-net45+win8\System.Reflection.Metadata.dll</HintPath> - </Reference> </ItemGroup> <ItemGroup> <Compile Include="BasicTests.cs" /> @@ -75,8 +57,5 @@ <Private>False</Private> </ProjectReference> </ItemGroup> - <ItemGroup> - <None Include="packages.config" /> - </ItemGroup> <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> </Project>
\ No newline at end of file diff --git a/main/src/addins/MonoDevelop.UnitTesting/MonoDevelop.UnitTesting.Tests/packages.config b/main/src/addins/MonoDevelop.UnitTesting/MonoDevelop.UnitTesting.Tests/packages.config deleted file mode 100644 index e1bc7cc738..0000000000 --- a/main/src/addins/MonoDevelop.UnitTesting/MonoDevelop.UnitTesting.Tests/packages.config +++ /dev/null @@ -1,7 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<packages> - <package id="Microsoft.TestPlatform.ObjectModel" version="15.5.0-preview-20170919-04" targetFramework="net461" /> - <package id="System.Collections.Immutable" version="1.5.0" targetFramework="net461" /> - <package id="System.Reflection.Metadata" version="1.6.0" targetFramework="net461" /> - <package id="System.Runtime.InteropServices.RuntimeInformation" version="4.3.0" targetFramework="net461" /> -</packages>
\ No newline at end of file diff --git a/main/src/addins/MonoDevelop.UnitTesting/MonoDevelop.UnitTesting.csproj b/main/src/addins/MonoDevelop.UnitTesting/MonoDevelop.UnitTesting.csproj index c46aebd964..dad7a5b79c 100644 --- a/main/src/addins/MonoDevelop.UnitTesting/MonoDevelop.UnitTesting.csproj +++ b/main/src/addins/MonoDevelop.UnitTesting/MonoDevelop.UnitTesting.csproj @@ -15,48 +15,11 @@ <Reference Include="System.Xml" /> <Reference Include="System.Xml.Linq" /> <Reference Include="System.Core" /> - <Reference Include="Microsoft.CodeAnalysis"> - <HintPath>..\..\..\build\bin\Microsoft.CodeAnalysis.dll</HintPath> - <Private>False</Private> - </Reference> <Reference Include="Microsoft.CSharp" /> <Reference Include="System.Configuration" /> <Reference Include="System.Runtime" /> <Reference Include="System.Runtime.Serialization" /> - <Reference Include="Newtonsoft.Json"> - <HintPath>..\..\..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath> - <Private>False</Private> - </Reference> - <Reference Include="System.Runtime.InteropServices.RuntimeInformation"> - <HintPath>..\..\..\packages\System.Runtime.InteropServices.RuntimeInformation.4.3.0\lib\net45\System.Runtime.InteropServices.RuntimeInformation.dll</HintPath> - <Private>False</Private> - </Reference> - <Reference Include="System.Collections.Immutable"> - <HintPath>..\..\..\packages\System.Collections.Immutable.1.5.0\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath> - <Private>False</Private> - </Reference> - <Reference Include="System.Reflection.Metadata"> - <HintPath>..\..\..\packages\System.Reflection.Metadata.1.6.0\lib\portable-net45+win8\System.Reflection.Metadata.dll</HintPath> - <Private>False</Private> - </Reference> - <Reference Include="Microsoft.VisualStudio.TestPlatform.ObjectModel"> - <HintPath>..\..\..\packages\Microsoft.TestPlatform.ObjectModel.15.5.0-preview-20170919-04\lib\net451\Microsoft.VisualStudio.TestPlatform.ObjectModel.dll</HintPath> - </Reference> - <Reference Include="Microsoft.TestPlatform.CommunicationUtilities"> - <HintPath>..\..\..\packages\Microsoft.TestPlatform.TranslationLayer.15.5.0-preview-20170919-04\lib\net451\Microsoft.TestPlatform.CommunicationUtilities.dll</HintPath> - </Reference> - <Reference Include="Microsoft.TestPlatform.CoreUtilities"> - <HintPath>..\..\..\packages\Microsoft.TestPlatform.TranslationLayer.15.5.0-preview-20170919-04\lib\net451\Microsoft.TestPlatform.CoreUtilities.dll</HintPath> - </Reference> - <Reference Include="Microsoft.TestPlatform.PlatformAbstractions"> - <HintPath>..\..\..\packages\Microsoft.TestPlatform.TranslationLayer.15.5.0-preview-20170919-04\lib\net451\Microsoft.TestPlatform.PlatformAbstractions.dll</HintPath> - </Reference> - <Reference Include="Microsoft.TestPlatform.VsTestConsole.TranslationLayer"> - <HintPath>..\..\..\packages\Microsoft.TestPlatform.TranslationLayer.15.5.0-preview-20170919-04\lib\net451\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.dll</HintPath> - </Reference> - <Reference Include="Microsoft.VisualStudio.TestPlatform.Common"> - <HintPath>..\..\..\packages\Microsoft.TestPlatform.TranslationLayer.15.5.0-preview-20170919-04\lib\net451\Microsoft.VisualStudio.TestPlatform.Common.dll</HintPath> - </Reference> + <PackageReference Include="Microsoft.TestPlatform.TranslationLayer" Version="$(NuGetVersionMicrosoftTestPlatform)" /> </ItemGroup> <ItemGroup> <ProjectReference Include="..\..\core\MonoDevelop.Core\MonoDevelop.Core.csproj"> @@ -183,9 +146,6 @@ <Compile Include="MonoDevelop.UnitTesting.VsTest\VsTestRunAdapter.cs" /> </ItemGroup> <ItemGroup> - <None Include="packages.config" /> - </ItemGroup> - <ItemGroup> <InternalsVisibleTo Include="MonoDevelop.UnitTesting.Tests" /> </ItemGroup> <ItemGroup> diff --git a/main/src/addins/MonoDevelop.UnitTesting/packages.config b/main/src/addins/MonoDevelop.UnitTesting/packages.config deleted file mode 100644 index 483a5ea57a..0000000000 --- a/main/src/addins/MonoDevelop.UnitTesting/packages.config +++ /dev/null @@ -1,10 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<packages> - <package id="Microsoft.TestPlatform" version="15.5.0-preview-20170919-04" targetFramework="net461" /> - <package id="Microsoft.TestPlatform.ObjectModel" version="15.5.0-preview-20170919-04" targetFramework="net461" /> - <package id="Microsoft.TestPlatform.TranslationLayer" version="15.5.0-preview-20170919-04" targetFramework="net461" /> - <package id="Newtonsoft.Json" version="10.0.3" targetFramework="net461" /> - <package id="System.Collections.Immutable" version="1.5.0" targetFramework="net461" /> - <package id="System.Reflection.Metadata" version="1.6.0" targetFramework="net461" /> - <package id="System.Runtime.InteropServices.RuntimeInformation" version="4.3.0" targetFramework="net461" /> -</packages>
\ No newline at end of file diff --git a/main/src/addins/TextTemplating/MonoDevelop.TextTemplating/MonoDevelop.TextTemplating.csproj b/main/src/addins/TextTemplating/MonoDevelop.TextTemplating/MonoDevelop.TextTemplating.csproj index a1591b8030..f3d267e019 100644 --- a/main/src/addins/TextTemplating/MonoDevelop.TextTemplating/MonoDevelop.TextTemplating.csproj +++ b/main/src/addins/TextTemplating/MonoDevelop.TextTemplating/MonoDevelop.TextTemplating.csproj @@ -33,13 +33,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> + <PackageReference Include="Mono.TextTemplating" Version="1.3.1" /> </ItemGroup> <ItemGroup> </ItemGroup> 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> diff --git a/main/src/addins/VersionControl/Subversion.Win32/VersionControl.Subversion.Win32.csproj b/main/src/addins/VersionControl/Subversion.Win32/VersionControl.Subversion.Win32.csproj index 14880ee24b..d79fab0a07 100644 --- a/main/src/addins/VersionControl/Subversion.Win32/VersionControl.Subversion.Win32.csproj +++ b/main/src/addins/VersionControl/Subversion.Win32/VersionControl.Subversion.Win32.csproj @@ -14,12 +14,7 @@ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " /> <ItemGroup> <Reference Include="System" /> - <Reference Include="SharpSvn"> - <HintPath>..\..\..\..\packages\SharpSvn.1.8-x86.1.8013.3694.107\lib\net40\SharpSvn.dll</HintPath> - </Reference> - <Reference Include="SharpSvn.UI"> - <HintPath>..\..\..\..\packages\SharpSvn.1.8-x86.1.8013.3694.107\lib\net40\SharpSvn.UI.dll</HintPath> - </Reference> + <PackageReference Include="SharpSvn.1.8-x86" Version="1.8013.3694.107" PrivateAssets="runtime" /> </ItemGroup> <ItemGroup> <InternalsVisibleTo Include="VersionControl.Subversion.Win32.Tests" /> @@ -76,16 +71,5 @@ <Private>False</Private> </ProjectReference> </ItemGroup> - <ItemGroup> - <None Include="..\..\..\..\packages\SharpSvn.1.8-x86.1.8013.3694.107\lib\net40\SharpPlink-Win32.svnExe"> - <Link>SharpPlink-Win32.svnExe</Link> - <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> - </None> - <None Include="..\..\..\..\packages\SharpSvn.1.8-x86.1.8013.3694.107\lib\net40\SharpSvn-DB44-20-win32.svnDll"> - <Link>SharpSvn-DB44-20-win32.svnDll</Link> - <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> - </None> - <None Include="packages.config" /> - </ItemGroup> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> </Project> diff --git a/main/src/addins/VersionControl/Subversion.Win32/packages.config b/main/src/addins/VersionControl/Subversion.Win32/packages.config deleted file mode 100644 index a4956b6c07..0000000000 --- a/main/src/addins/VersionControl/Subversion.Win32/packages.config +++ /dev/null @@ -1,4 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?>
-<packages>
- <package id="SharpSvn.1.8-x86" version="1.8013.3694.107" targetFramework="net45" />
-</packages>
\ No newline at end of file |