diff options
author | Lluis Sanchez <lluis@xamarin.com> | 2017-03-24 20:14:15 +0300 |
---|---|---|
committer | Lluis Sanchez <lluis@xamarin.com> | 2017-03-24 20:14:15 +0300 |
commit | a306f11d84bfb6dfc8702a7c0817547bd76f7ebf (patch) | |
tree | 02ce156f6502f431aa7d8a9eba93a8e78c94cc45 /main/src/addins/VersionControl | |
parent | a2060f18c243d70e58b7edb2f63b76515d295a8b (diff) | |
parent | 84efb9eaea49a3f4bcaeeae46d1c4e86512dc709 (diff) |
Merge remote-tracking branch 'origin/master' into vNext-webtools-platform
Diffstat (limited to 'main/src/addins/VersionControl')
13 files changed, 37 insertions, 22 deletions
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git.Tests/MonoDevelop.VersionControl.Git.Tests.csproj b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git.Tests/MonoDevelop.VersionControl.Git.Tests.csproj index 2d2b01fe3b..8913155b17 100644 --- a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git.Tests/MonoDevelop.VersionControl.Git.Tests.csproj +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git.Tests/MonoDevelop.VersionControl.Git.Tests.csproj @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="..\..\..\..\MonoDevelop.props" /> <PropertyGroup> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> @@ -11,7 +12,7 @@ <AssemblyName>MonoDevelop.VersionControl.Git.Tests</AssemblyName> <TestRunnerCommand>..\..\..\..\build\bin\mdtool.exe</TestRunnerCommand> <TestRunnerArgs>run-md-tests</TestRunnerArgs> - <TargetFrameworkVersion>v4.5</TargetFrameworkVersion> + <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <DebugSymbols>true</DebugSymbols> diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/AssemblyInfo.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/AssemblyInfo.cs index 70b0a32308..bb247e23d4 100644 --- a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/AssemblyInfo.cs +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/AssemblyInfo.cs @@ -8,5 +8,3 @@ using System.Runtime.CompilerServices; [assembly: AssemblyDescription ("Git support for the Version Control Add-in")] [assembly: AssemblyVersion ("2.6")] [assembly: AssemblyCopyright ("LGPL")] - -[assembly:InternalsVisibleTo ("MonoDevelop.VersionControl.Git.Tests")] diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git.csproj b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git.csproj index 43f5ea8070..32d256c6d2 100644 --- a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git.csproj +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git.csproj @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="..\..\..\..\MonoDevelop.props" /> <PropertyGroup> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> @@ -9,7 +10,7 @@ <OutputType>Library</OutputType> <RootNamespace>MonoDevelop.VersionControl.Git</RootNamespace> <AssemblyName>MonoDevelop.VersionControl.Git</AssemblyName> - <TargetFrameworkVersion>v4.5</TargetFrameworkVersion> + <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <DebugSymbols>True</DebugSymbols> @@ -227,6 +228,9 @@ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> </None> </ItemGroup> + <ItemGroup> + <InternalsVisibleTo Include="MonoDevelop.VersionControl.Git.Tests" /> + </ItemGroup> <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> <Choose> <When Condition=" '$(Configuration)' == 'DebugMac' OR '$(Configuration)' == 'ReleaseMac' "> diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion.Tests/MonoDevelop.VersionControl.Subversion.Tests.csproj b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion.Tests/MonoDevelop.VersionControl.Subversion.Tests.csproj index 1d3245425d..598af8a2fc 100644 --- a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion.Tests/MonoDevelop.VersionControl.Subversion.Tests.csproj +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion.Tests/MonoDevelop.VersionControl.Subversion.Tests.csproj @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="..\..\..\..\MonoDevelop.props" /> <PropertyGroup> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> @@ -11,7 +12,7 @@ <AssemblyName>MonoDevelop.VersionControl.Subversion.Tests</AssemblyName> <TestRunnerCommand>..\..\..\..\build\bin\mdtool.exe</TestRunnerCommand> <TestRunnerArgs>run-md-tests</TestRunnerArgs> - <TargetFrameworkVersion>v4.5</TargetFrameworkVersion> + <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <DebugSymbols>true</DebugSymbols> diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion.Unix/AssemblyInfo.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion.Unix/AssemblyInfo.cs index b27fed544b..e58febf58d 100644 --- a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion.Unix/AssemblyInfo.cs +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion.Unix/AssemblyInfo.cs @@ -49,5 +49,3 @@ using System.Runtime.CompilerServices; //[assembly: AssemblyDelaySign(false)] //[assembly: AssemblyKeyFile("")] - -[assembly: InternalsVisibleTo ("MonoDevelop.VersionControl.Subversion.Tests")] diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion.Unix/MonoDevelop.VersionControl.Subversion.Unix.csproj b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion.Unix/MonoDevelop.VersionControl.Subversion.Unix.csproj index e078d74d74..d29c22aec5 100644 --- a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion.Unix/MonoDevelop.VersionControl.Subversion.Unix.csproj +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion.Unix/MonoDevelop.VersionControl.Subversion.Unix.csproj @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="..\..\..\..\MonoDevelop.props" /> <PropertyGroup> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> @@ -9,7 +10,7 @@ <OutputType>Library</OutputType> <RootNamespace>MonoDevelop.VersionControl.Subversion.Unix</RootNamespace> <AssemblyName>MonoDevelop.VersionControl.Subversion.Unix</AssemblyName> - <TargetFrameworkVersion>v4.5</TargetFrameworkVersion> + <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <DebugSymbols>True</DebugSymbols> @@ -72,7 +73,6 @@ <Compile Include="MonoDevelop.VersionControl.Subversion.Unix\LibSvnClient1.cs" /> <Compile Include="AddinInfo.cs" /> </ItemGroup> - <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> <ItemGroup> <Folder Include="MonoDevelop.VersionControl.Subversion.Unix\" /> </ItemGroup> @@ -116,6 +116,10 @@ <ItemGroup Condition=" '$(Configuration)' == 'DebugMac' Or '$(Configuration)' == 'ReleaseMac' "> <NativeBinaries Include="..\..\..\..\external\sharpsvn-binary\mac\*.dylib" /> </ItemGroup> + <ItemGroup> + <InternalsVisibleTo Include="MonoDevelop.VersionControl.Subversion.Tests" /> + </ItemGroup> + <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> <Target Name="AfterBuild"> <Copy SourceFiles="@(NativeBinaries)" DestinationFolder="$(OutputPath)\" SkipUnchangedFiles="true" /> </Target> diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/AssemblyInfo.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/AssemblyInfo.cs index c6c941668e..64323cb4b5 100644 --- a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/AssemblyInfo.cs +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/AssemblyInfo.cs @@ -8,6 +8,3 @@ using System.Runtime.CompilerServices; [assembly: AssemblyDescription ("Subversion support for the Version Control Add-in")] [assembly: AssemblyVersion ("2.6")] [assembly: AssemblyCopyright ("LGPL")] -[assembly: InternalsVisibleTo ("MonoDevelop.VersionControl.Subversion.Tests")] -[assembly: InternalsVisibleTo ("MonoDevelop.VersionControl.Subversion.Unix")] -[assembly: InternalsVisibleTo ("VersionControl.Subversion.Win32")] diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion.csproj b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion.csproj index 246c37e835..10a227fa6e 100644 --- a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion.csproj +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion.csproj @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0"> + <Import Project="..\..\..\..\MonoDevelop.props" /> <PropertyGroup> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> @@ -9,7 +10,7 @@ <OutputType>Library</OutputType> <AssemblyName>MonoDevelop.VersionControl.Subversion</AssemblyName> <RootNamespace>MonoDevelop.VersionControl.Subversion</RootNamespace> - <TargetFrameworkVersion>v4.5</TargetFrameworkVersion> + <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <DebugSymbols>True</DebugSymbols> @@ -125,6 +126,11 @@ <LogicalName>gui.stetic</LogicalName> </EmbeddedResource> </ItemGroup> + <ItemGroup> + <InternalsVisibleTo Include="MonoDevelop.VersionControl.Subversion.Tests" /> + <InternalsVisibleTo Include="MonoDevelop.VersionControl.Subversion.Unix" /> + <InternalsVisibleTo Include="VersionControl.Subversion.Win32" /> + </ItemGroup> <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> <ItemGroup> <Folder Include="MonoDevelop.VersionControl.Subversion\" /> diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/AssemblyInfo.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl/AssemblyInfo.cs index b2b45395ee..c84d95b3f6 100644 --- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/AssemblyInfo.cs +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/AssemblyInfo.cs @@ -8,5 +8,3 @@ using System.Runtime.CompilerServices; [assembly: AssemblyDescription ("A MonoDevelop addin for using version control systems like Subversion")] [assembly: AssemblyVersion ("2.6")] [assembly: AssemblyCopyright ("LGPL")] -[assembly: InternalsVisibleTo ("UnitTests")] -[assembly: InternalsVisibleTo ("MonoDevelop.MacDev")] diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.csproj b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.csproj index 4a0a935002..9713123b10 100644 --- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.csproj +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.csproj @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0"> + <Import Project="..\..\..\..\MonoDevelop.props" /> <PropertyGroup> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> @@ -9,7 +10,7 @@ <OutputType>Library</OutputType> <AssemblyName>MonoDevelop.VersionControl</AssemblyName> <RootNamespace>MonoDevelop.VersionControl</RootNamespace> - <TargetFrameworkVersion>v4.5</TargetFrameworkVersion> + <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <DebugSymbols>True</DebugSymbols> @@ -1257,5 +1258,9 @@ <ItemGroup> <None Include="Makefile.am" /> </ItemGroup> + <ItemGroup> + <InternalsVisibleTo Include="UnitTests" /> + <InternalsVisibleTo Include="MonoDevelop.MacDev" /> + </ItemGroup> <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> </Project> diff --git a/main/src/addins/VersionControl/Subversion.Win32.Tests/VersionControl.Subversion.Win32.Tests.csproj b/main/src/addins/VersionControl/Subversion.Win32.Tests/VersionControl.Subversion.Win32.Tests.csproj index 77b130036b..835898083f 100644 --- a/main/src/addins/VersionControl/Subversion.Win32.Tests/VersionControl.Subversion.Win32.Tests.csproj +++ b/main/src/addins/VersionControl/Subversion.Win32.Tests/VersionControl.Subversion.Win32.Tests.csproj @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="..\..\..\..\MonoDevelop.props" /> <PropertyGroup> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> @@ -11,7 +12,7 @@ <AssemblyName>VersionControl.Subversion.Win32.Tests</AssemblyName> <TestRunnerCommand>..\..\..\..\build\bin\mdtool.exe</TestRunnerCommand> <TestRunnerArgs>run-md-tests</TestRunnerArgs> - <TargetFrameworkVersion>v4.5</TargetFrameworkVersion> + <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <DebugSymbols>true</DebugSymbols> @@ -69,4 +70,4 @@ <Private>False</Private> </ProjectReference> </ItemGroup> -</Project>
\ No newline at end of file +</Project> diff --git a/main/src/addins/VersionControl/Subversion.Win32/Properties/AssemblyInfo.cs b/main/src/addins/VersionControl/Subversion.Win32/Properties/AssemblyInfo.cs index 8756b9c88c..606e447e1b 100644 --- a/main/src/addins/VersionControl/Subversion.Win32/Properties/AssemblyInfo.cs +++ b/main/src/addins/VersionControl/Subversion.Win32/Properties/AssemblyInfo.cs @@ -36,5 +36,3 @@ using System.Runtime.CompilerServices; // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion ("1.0.0.0")]
[assembly: AssemblyFileVersion ("1.0.0.0")]
-
-[assembly: InternalsVisibleTo ("VersionControl.Subversion.Win32.Tests")]
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 73aeab1951..fbb6a181e0 100644 --- a/main/src/addins/VersionControl/Subversion.Win32/VersionControl.Subversion.Win32.csproj +++ b/main/src/addins/VersionControl/Subversion.Win32/VersionControl.Subversion.Win32.csproj @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="..\..\..\..\MonoDevelop.props" /> <PropertyGroup> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> @@ -10,7 +11,7 @@ <AppDesignerFolder>Properties</AppDesignerFolder> <RootNamespace>SubversionAddinWindows</RootNamespace> <AssemblyName>SubversionAddinWindows</AssemblyName> - <TargetFrameworkVersion>v4.5</TargetFrameworkVersion> + <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion> <FileAlignment>512</FileAlignment> <FileUpgradeFlags> </FileUpgradeFlags> @@ -67,6 +68,9 @@ </Reference> </ItemGroup> <ItemGroup> + <InternalsVisibleTo Include="VersionControl.Subversion.Win32.Tests" /> + </ItemGroup> + <ItemGroup> <Compile Include="SvnSharpClient.cs" /> <Compile Include="Properties\AssemblyInfo.cs" /> <Compile Include="AddinInfo.cs" /> @@ -130,4 +134,4 @@ </None> <None Include="packages.config" /> </ItemGroup> -</Project>
\ No newline at end of file +</Project> |