diff options
11 files changed, 17 insertions, 23 deletions
diff --git a/main/po/po.mdproj b/main/po/po.mdproj index e8855a228a..ce55684ea7 100644 --- a/main/po/po.mdproj +++ b/main/po/po.mdproj @@ -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> diff --git a/main/src/addins/MonoDevelop.Debugger.Win32/Mono.Debugging.Win32/Mono.Debugging.Win32.csproj b/main/src/addins/MonoDevelop.Debugger.Win32/Mono.Debugging.Win32/Mono.Debugging.Win32.csproj index 7565b34341..f6329ebe42 100644 --- a/main/src/addins/MonoDevelop.Debugger.Win32/Mono.Debugging.Win32/Mono.Debugging.Win32.csproj +++ b/main/src/addins/MonoDevelop.Debugger.Win32/Mono.Debugging.Win32/Mono.Debugging.Win32.csproj @@ -1,6 +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" /> + <Import Project="..\..\..\..\MonoDevelop.props" /> <PropertyGroup> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> @@ -35,13 +35,6 @@ <DebugSymbols>true</DebugSymbols> <Prefer32Bit>false</Prefer32Bit> </PropertyGroup> - <PropertyGroup> - <SignAssembly>true</SignAssembly> - </PropertyGroup> - <PropertyGroup> - <AssemblyOriginatorKeyFile> - </AssemblyOriginatorKeyFile> - </PropertyGroup> <ItemGroup> <Reference Include="System" /> <Reference Include="System.Core" /> 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 3bd4a81b1d..fbb6a181e0 100644 --- a/main/src/addins/VersionControl/Subversion.Win32/VersionControl.Subversion.Win32.csproj +++ b/main/src/addins/VersionControl/Subversion.Win32/VersionControl.Subversion.Win32.csproj @@ -68,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" /> diff --git a/main/src/addins/WindowsPlatform/WindowsAPICodePack/Core/Core.csproj b/main/src/addins/WindowsPlatform/WindowsAPICodePack/Core/Core.csproj index 02ab617605..68259ccc90 100644 --- a/main/src/addins/WindowsPlatform/WindowsAPICodePack/Core/Core.csproj +++ b/main/src/addins/WindowsPlatform/WindowsAPICodePack/Core/Core.csproj @@ -1,6 +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" /> + <Import Project="..\..\..\..\..\MonoDevelop.props" /> <PropertyGroup> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> @@ -103,6 +103,11 @@ <Reference Include="System.Xml" /> </ItemGroup> <ItemGroup> + <InternalsVisibleTo Include="Microsoft.WindowsAPICodePack.Shell" /> + <InternalsVisibleTo Include="Microsoft.WindowsAPICodePack.Sensors" /> + <InternalsVisibleTo Include="Microsoft.WindowsAPICodePack.ShellExtensions" /> + </ItemGroup> + <ItemGroup> <Compile Include="AppRestartRecovery\ApplicationRestartRecoveryManager.cs" /> <Compile Include="AppRestartRecovery\ApplicationRecoveryException.cs" /> <Compile Include="AppRestartRecovery\RecoveryData.cs" /> diff --git a/main/src/addins/WindowsPlatform/WindowsAPICodePack/Core/Properties/AssemblyInfo.cs b/main/src/addins/WindowsPlatform/WindowsAPICodePack/Core/Properties/AssemblyInfo.cs index 58b5bbb2df..e1c4448640 100644 --- a/main/src/addins/WindowsPlatform/WindowsAPICodePack/Core/Properties/AssemblyInfo.cs +++ b/main/src/addins/WindowsPlatform/WindowsAPICodePack/Core/Properties/AssemblyInfo.cs @@ -18,11 +18,6 @@ using System.Resources; [assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
-
-[assembly: InternalsVisibleTo("Microsoft.WindowsAPICodePack.Shell")]
-[assembly: InternalsVisibleTo("Microsoft.WindowsAPICodePack.Sensors")]
-[assembly: InternalsVisibleTo("Microsoft.WindowsAPICodePack.ShellExtensions")]
-
// Setting ComVisible to false makes the types in this assembly not visible
// to COM components. If you need to access a type in this assembly from
// COM, set the ComVisible attribute to true on that type.
diff --git a/main/src/addins/WindowsPlatform/WindowsAPICodePack/Shell/Properties/AssemblyInfo.cs b/main/src/addins/WindowsPlatform/WindowsAPICodePack/Shell/Properties/AssemblyInfo.cs index 8e20e57dc8..614547ce23 100644 --- a/main/src/addins/WindowsPlatform/WindowsAPICodePack/Shell/Properties/AssemblyInfo.cs +++ b/main/src/addins/WindowsPlatform/WindowsAPICodePack/Shell/Properties/AssemblyInfo.cs @@ -19,8 +19,6 @@ using System.Security; [assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
-[assembly: InternalsVisibleTo("Microsoft.WindowsAPICodePack.ShellExtensions")]
-
// Setting ComVisible to false makes the types in this assembly not visible
// to COM components. If you need to access a type in this assembly from
// COM, set the ComVisible attribute to true on that type.
@@ -40,5 +38,3 @@ using System.Security; [assembly: AssemblyFileVersion("1.1.0.0")]
[assembly: NeutralResourcesLanguageAttribute("en")]
-
-[assembly: InternalsVisibleTo("WindowsPlatform")]
diff --git a/main/src/addins/WindowsPlatform/WindowsAPICodePack/Shell/Shell.csproj b/main/src/addins/WindowsPlatform/WindowsAPICodePack/Shell/Shell.csproj index c5b2fdbad9..b1e2852773 100644 --- a/main/src/addins/WindowsPlatform/WindowsAPICodePack/Shell/Shell.csproj +++ b/main/src/addins/WindowsPlatform/WindowsAPICodePack/Shell/Shell.csproj @@ -145,6 +145,10 @@ <Reference Include="System.Xaml" /> </ItemGroup> <ItemGroup> + <InternalsVisibleTo Include="Microsoft.WindowsAPICodePack.ShellExtensions" /> + <InternalsVisibleTo Include="WindowsPlatform" /> + </ItemGroup> + <ItemGroup> <Compile Include="Common\EnumUnknown.cs" /> <Compile Include="Common\EventHandlerExtensionMethods.cs" /> <Compile Include="Common\NativePoint.cs" /> diff --git a/main/src/addins/WindowsPlatform/WindowsPlatform/WindowsPlatform.csproj b/main/src/addins/WindowsPlatform/WindowsPlatform/WindowsPlatform.csproj index 52d9487be7..288cbe941b 100644 --- a/main/src/addins/WindowsPlatform/WindowsPlatform/WindowsPlatform.csproj +++ b/main/src/addins/WindowsPlatform/WindowsPlatform/WindowsPlatform.csproj @@ -1,6 +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" /> + <Import Project="..\..\..\..\MonoDevelop.props" /> <PropertyGroup> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> diff --git a/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.Formats.MSBuild.dotnet.v14.0.csproj b/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.Formats.MSBuild.dotnet.v14.0.csproj index f3c01d0c7b..bd6f87489e 100644 --- a/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.Formats.MSBuild.dotnet.v14.0.csproj +++ b/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.Formats.MSBuild.dotnet.v14.0.csproj @@ -58,5 +58,4 @@ </ItemGroup> <Import Project="MonoDevelop.Projects.MSBuild.Shared\MonoDevelop.Projects.MSBuild.Shared.projitems" Label="Shared" Condition="Exists('MonoDevelop.Projects.MSBuild.Shared\MonoDevelop.Projects.MSBuild.Shared.projitems')" /> <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> - <Import Project="$(MonoDevelopTargets)" /> </Project> diff --git a/main/tests/WindowsPlatform.Tests/Properties/AssemblyInfo.cs b/main/tests/WindowsPlatform.Tests/Properties/AssemblyInfo.cs index 6ff32285f1..41fd343ba5 100644 --- a/main/tests/WindowsPlatform.Tests/Properties/AssemblyInfo.cs +++ b/main/tests/WindowsPlatform.Tests/Properties/AssemblyInfo.cs @@ -42,7 +42,7 @@ using System.Runtime.CompilerServices; // The form "{Major}.{Minor}.*" will automatically update the build and revision,
// and "{Major}.{Minor}.{Build}.*" will update just the revision.
-[assembly: AssemblyVersion ("1.0.*")]
+[assembly: AssemblyVersion ("1.0.0.0")]
// The following attributes are used to specify the signing key for the assembly,
// if desired. See the Mono documentation for more information about signing.
|