diff options
author | Matt Ward <matt.ward@microsoft.com> | 2021-02-09 14:36:42 +0300 |
---|---|---|
committer | Matt Ward <matt.ward@microsoft.com> | 2021-02-09 14:36:42 +0300 |
commit | 2a4824da0df39885df43dfedb624bb1a0851f35e (patch) | |
tree | 08fa62b0d404fcf95366209099446d3203da0347 | |
parent | fcef654271455779ff82969161423084566be9d5 (diff) |
Fix reference conflicts build warnings
Still have warnings about conflicts in mautil.
One warning about Mono.Addins not being strong named.
-rw-r--r-- | Mono.Addins.CecilReflector/Mono.Addins.CecilReflector.csproj | 2 | ||||
-rw-r--r-- | Mono.Addins.Gui/AssemblyInfo.cs | 20 | ||||
-rw-r--r-- | Mono.Addins.GuiGtk3/AssemblyInfo.cs | 47 | ||||
-rw-r--r-- | Mono.Addins.MSBuild/Mono.Addins.MSBuild.csproj | 3 | ||||
-rw-r--r-- | Mono.Addins.Setup/Mono.Addins.Setup.csproj | 4 | ||||
-rw-r--r-- | Mono.Addins.SetupProcess/Mono.Addins.SetupProcess.csproj | 7 | ||||
-rw-r--r-- | Mono.Addins/Mono.Addins.csproj | 3 |
7 files changed, 0 insertions, 86 deletions
diff --git a/Mono.Addins.CecilReflector/Mono.Addins.CecilReflector.csproj b/Mono.Addins.CecilReflector/Mono.Addins.CecilReflector.csproj index 95c0c8e..623064e 100644 --- a/Mono.Addins.CecilReflector/Mono.Addins.CecilReflector.csproj +++ b/Mono.Addins.CecilReflector/Mono.Addins.CecilReflector.csproj @@ -36,8 +36,6 @@ <PackOnBuild>True</PackOnBuild> </PropertyGroup> <ItemGroup> - <Reference Include="System" /> - <Reference Include="System.Core" /> <PackageReference Include="Mono.Cecil" Version="0.10.1" /> <PackageReference Include="NuGet.Build.Packaging" Version="0.2.0" /> <ProjectReference Include="..\Mono.Addins\Mono.Addins.csproj"> diff --git a/Mono.Addins.Gui/AssemblyInfo.cs b/Mono.Addins.Gui/AssemblyInfo.cs deleted file mode 100644 index d89fc44..0000000 --- a/Mono.Addins.Gui/AssemblyInfo.cs +++ /dev/null @@ -1,20 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; - -// Information about this assembly is defined by the following -// attributes. -// -// change them to the information which is associated with the assembly -// you compile. - -[assembly: AssemblyTitle("Mono.Addins.Gui")] -[assembly: AssemblyCopyright("Copyright (C) 2007 Novell, Inc (http://www.novell.com)")] - -// The assembly version has following format : -// -// Major.Minor.Build.Revision -// -// You can specify all values by your own or you can build default build and revision -// numbers with the '*' character (the default): - -[assembly: AssemblyVersion("1.0.0.0")] diff --git a/Mono.Addins.GuiGtk3/AssemblyInfo.cs b/Mono.Addins.GuiGtk3/AssemblyInfo.cs deleted file mode 100644 index 0dedf16..0000000 --- a/Mono.Addins.GuiGtk3/AssemblyInfo.cs +++ /dev/null @@ -1,47 +0,0 @@ -// -// AssemblyInfo.cs -// -// Author: -// Robert Nordan <rpvn@robpvn.net> -// -// Copyright (c) 2013 Robert Nordan -// -// Permission is hereby granted, free of charge, to any person obtaining a copy -// of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights -// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -// copies of the Software, and to permit persons to whom the Software is -// furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included in -// all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -// THE SOFTWARE. -using System.Reflection; -using System.Runtime.CompilerServices; - -// Information about this assembly is defined by the following attributes. -// Change them to the values specific to your project. -[assembly: AssemblyTitle ("Mono.Addins.GuiGtk3")] -[assembly: AssemblyDescription ("")] -[assembly: AssemblyConfiguration ("")] -[assembly: AssemblyCompany ("")] -[assembly: AssemblyProduct ("")] -[assembly: AssemblyCopyright ("Robert Nordan")] -[assembly: AssemblyTrademark ("")] -[assembly: AssemblyCulture ("")] -// The assembly version has the format "{Major}.{Minor}.{Build}.{Revision}". -// The form "{Major}.{Minor}.*" will automatically update the build and revision, -// and "{Major}.{Minor}.{Build}.*" will update just the revision. -[assembly: AssemblyVersion ("1.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. -//[assembly: AssemblyDelaySign(false)] -//[assembly: AssemblyKeyFile("")] - diff --git a/Mono.Addins.MSBuild/Mono.Addins.MSBuild.csproj b/Mono.Addins.MSBuild/Mono.Addins.MSBuild.csproj index 57af6e8..b60729b 100644 --- a/Mono.Addins.MSBuild/Mono.Addins.MSBuild.csproj +++ b/Mono.Addins.MSBuild/Mono.Addins.MSBuild.csproj @@ -30,9 +30,6 @@ <DebugSymbols>true</DebugSymbols> </PropertyGroup> <ItemGroup> - <Reference Include="System" /> - </ItemGroup> - <ItemGroup> <PackageReference Include="Microsoft.Build.Utilities.Core" Version="16.8.0" /> <ProjectReference Include="..\Mono.Addins.Setup\Mono.Addins.Setup.csproj" /> <ProjectReference Include="..\Mono.Addins\Mono.Addins.csproj"> diff --git a/Mono.Addins.Setup/Mono.Addins.Setup.csproj b/Mono.Addins.Setup/Mono.Addins.Setup.csproj index a115eda..39bf691 100644 --- a/Mono.Addins.Setup/Mono.Addins.Setup.csproj +++ b/Mono.Addins.Setup/Mono.Addins.Setup.csproj @@ -41,10 +41,6 @@ <PackOnBuild>True</PackOnBuild> </PropertyGroup> <ItemGroup> - <Reference Include="System" /> - <Reference Include="System.Xml" /> - <Reference Include="System.Core" /> - <Reference Include="System.Net.Http" /> <PackageReference Include="SharpZipLib" Version="1.1.0" /> <ProjectReference Include="..\Mono.Addins\Mono.Addins.csproj"> <Project>{91DD5A2D-9FE3-4C3C-9253-876141874DAD}</Project> diff --git a/Mono.Addins.SetupProcess/Mono.Addins.SetupProcess.csproj b/Mono.Addins.SetupProcess/Mono.Addins.SetupProcess.csproj index 8b10c29..8b1b104 100644 --- a/Mono.Addins.SetupProcess/Mono.Addins.SetupProcess.csproj +++ b/Mono.Addins.SetupProcess/Mono.Addins.SetupProcess.csproj @@ -31,13 +31,6 @@ <WarningLevel>4</WarningLevel>
<ExternalConsole>true</ExternalConsole>
</PropertyGroup>
-<!-- <ItemGroup>
- <Reference Include="System" />
- </ItemGroup>
- <ItemGroup>
- <Compile Include="Properties\AssemblyInfo.cs" />
- <Compile Include="SetupProcessTool.cs" />
- </ItemGroup>-->
<ItemGroup>
<ProjectReference Include="..\Mono.Addins\Mono.Addins.csproj" />
</ItemGroup>
diff --git a/Mono.Addins/Mono.Addins.csproj b/Mono.Addins/Mono.Addins.csproj index 6060cf2..de07483 100644 --- a/Mono.Addins/Mono.Addins.csproj +++ b/Mono.Addins/Mono.Addins.csproj @@ -38,9 +38,6 @@ <PackOnBuild>True</PackOnBuild> </PropertyGroup> <ItemGroup> - <Reference Include="System" /> - <Reference Include="System.Xml" /> - <Reference Include="System.Core" /> <PackageReference Include="NuGet.Build.Packaging" Version="0.2.0" /> <PackageReference Include="System.Reflection.Emit" Version="4.7.0" /> </ItemGroup> |