Skip to content
This repository has been archived by the owner on Sep 4, 2024. It is now read-only.

.NET Standard 2.0 #171

Merged
merged 23 commits into from
Dec 16, 2021
Merged

.NET Standard 2.0 #171

Show file tree
Hide file tree
Changes from 22 commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
c49fa85
Update to new MSBuild format in project files. Changed Mono.Addins to…
mikkeljohnsen Dec 16, 2020
66a3d55
It should now use SetupProcess if isolation is required.
mikkeljohnsen Jan 26, 2021
ed0a40b
Revert changes and use Content
mikkeljohnsen Jan 26, 2021
481723b
Removed AssemblyInfo.cs from Git and added InternalsVisibleTo to the …
mikkeljohnsen Jan 28, 2021
7a14e93
Changed Mono.Addins.Setup to netstandard2.0 and included ResolveAddin…
mikkeljohnsen Jan 28, 2021
a3015b1
Fix build errors about duplicate assembly attributes
mrward Feb 5, 2021
d6bf9e8
Try avoiding emitting assembly to run setup process
Therzok Nov 22, 2019
849d197
Fix incorrect setup process path
mrward Feb 8, 2021
d0fc3fa
Fix SetupProcess project's target framework
mrward Feb 8, 2021
b7aa8c3
UnitTests now local copy the SetupProcess exe
mrward Feb 8, 2021
b280fad
Fix IndexOutOfRangeException when using get-desc with SetupProcess
mrward Feb 8, 2021
fcef654
Convert Mono.Addins.SetupProcess to SDK style project
mrward Feb 9, 2021
2a4824d
Fix reference conflicts build warnings
mrward Feb 9, 2021
7c0fa13
Fix tests failing due to not finding the lib directory
mrward Feb 9, 2021
fa7848a
Fix tests failing due to test addins having different assembly version
mrward Feb 9, 2021
25423b0
Fix failing tests due to Debug.Assert
mrward Feb 9, 2021
8f1aafc
CecilReflector projects now targets .NET Standard 2.0
mrward Feb 18, 2021
91a93a3
Build all projects to bin without target framework name
mrward Feb 19, 2021
9426beb
Sign assemblies
mrward Feb 19, 2021
6773e88
Fix building warning mautil about binding redirects.
mrward Feb 19, 2021
ae7377e
UnitTests now local copy setup process executable
mrward Feb 19, 2021
f8ce8e8
Support launch external setup process with dotnet
mrward Feb 19, 2021
380cce0
Revert changes in Mono.Addins.Gui*
slluis Jul 14, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 0 additions & 20 deletions Mono.Addins.CecilReflector/AssemblyInfo.cs
View file
Open in desktop

This file was deleted.

25 changes: 7 additions & 18 deletions Mono.Addins.CecilReflector/Mono.Addins.CecilReflector.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
<Import Project="..\TargetFrameworks.props" />
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="..\Version.props" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{42D1CE65-A14B-4218-B787-58AD7AA68513}</ProjectGuid>
<OutputType>Library</OutputType>
<AssemblyName>Mono.Addins.CecilReflector</AssemblyName>
<RootNamespace>Mono.Addins.CecilReflector</RootNamespace>
<SignAssembly>True</SignAssembly>
<AssemblyOriginatorKeyFile>..\mono-addins.snk</AssemblyOriginatorKeyFile>
<TargetFramework>netstandard2.0</TargetFramework>
<PackageId>Mono.Addins.CecilReflector</PackageId>
<Description>Mono.Addins is a framework for creating extensible applications, and for creating add-ins which extend applications. Mono.Addins.Setup provides an API for managing add-ins, creating add-in packages and publishing add-ins in on-line repositories.</Description>
<ProductVersion>8.0.30703</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<SignAssembly>True</SignAssembly>
<AssemblyOriginatorKeyFile>..\mono-addins.snk</AssemblyOriginatorKeyFile>
<AssemblyVersion>1.0.0.0</AssemblyVersion>
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>True</DebugSymbols>
Expand All @@ -40,18 +39,8 @@
<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">
<Project>{91DD5A2D-9FE3-4C3C-9253-876141874DAD}</Project>
<Name>Mono.Addins</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Compile Include="Mono.Addins.CecilReflector\Reflector.cs" />
<Compile Include="AssemblyInfo.cs" />
<ProjectReference Include="..\Mono.Addins\Mono.Addins.csproj" />
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
</Project>
20 changes: 0 additions & 20 deletions Mono.Addins.Gui/AssemblyInfo.cs
View file
Open in desktop

This file was deleted.

48 changes: 3 additions & 45 deletions Mono.Addins.Gui/Mono.Addins.Gui.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="..\TargetFrameworks.props" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>8.0.30703</ProductVersion>
<ProjectGuid>{FEC19BDA-4904-4005-8C09-68E82E8BEF6A}</ProjectGuid>
<OutputType>Library</OutputType>
Expand All @@ -13,6 +11,7 @@
<SignAssembly>True</SignAssembly>
<AssemblyOriginatorKeyFile>..\mono-addins.snk</AssemblyOriginatorKeyFile>
<RestoreProjectStyle>PackageReference</RestoreProjectStyle>
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>True</DebugSymbols>
Expand All @@ -39,57 +38,20 @@
<NoWarn>1574;1591</NoWarn>
</PropertyGroup>
<ItemGroup>
<Reference Include="atk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f, processorArchitecture=MSIL"/>
<Reference Include="gdk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f, processorArchitecture=MSIL"/>
<Reference Include="glib-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f, processorArchitecture=MSIL"/>
<Reference Include="gtk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f, processorArchitecture=MSIL"/>
<Reference Include="pango-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f, processorArchitecture=MSIL"/>
<Reference Include="System" />
<Reference Include="Mono.Posix" />
<Reference Include="Mono.Cairo" />
<Reference Include="System.Core" />
<PackageReference Include="GtkSharp" Version="3.22.25.128" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Mono.Addins\Mono.Addins.csproj">
<Project>{91DD5A2D-9FE3-4C3C-9253-876141874DAD}</Project>
<Name>Mono.Addins</Name>
<Private>False</Private>
</ProjectReference>
<ProjectReference Include="..\Mono.Addins.Setup\Mono.Addins.Setup.csproj">
<Project>{A85C9721-C054-4BD8-A1F3-0227615F0A36}</Project>
<Name>Mono.Addins.Setup</Name>
<Private>False</Private>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Compile Include="AssemblyInfo.cs" />
<Compile Include="Mono.Addins.Gui\AddinManagerDialog.cs" />
<Compile Include="Mono.Addins.Gui\AddinTreeWidget.cs" />
<Compile Include="Mono.Addins.Gui\ManageSitesDialog.cs" />
<Compile Include="Mono.Addins.Gui\NewSiteDialog.cs" />
<Compile Include="Mono.Addins.Gui\Services.cs" />
<Compile Include="Mono.Addins.Gui\ErrorDialog.cs" />
<Compile Include="Mono.Addins.Gui\AddinManagerWindow.cs" />
<Compile Include="Mono.Addins.Gui\AddinInstaller.cs" />
<Compile Include="Mono.Addins.Gui\AddinInstallerDialog.cs" />
<Compile Include="Mono.Addins.Gui\ProgressDialog.cs" />
<Compile Include="Mono.Addins.Gui\InstallDialog.cs" />
<Compile Include="Mono.Addins.Gui\AddinInfoView.cs" />
<Compile Include="Mono.Addins.Gui\HeaderBox.cs" />
<Compile Include="Mono.Addins.Gui\HslColor.cs" />
<Compile Include="Mono.Addins.Gui\SearchEntry.cs" />
<Compile Include="Mono.Addins.Gui\HoverImageButton.cs" />
<Compile Include="Mono.Addins.Gui\InstallMonitor.cs" />
<Compile Include="Gui\generated.cs" />
<Compile Include="Gui\Mono.Addins.Gui.AddinInfoView.cs" />
<Compile Include="Gui\Mono.Addins.Gui.AddinInstallerDialog.cs" />
<Compile Include="Gui\Mono.Addins.Gui.AddinManagerDialog.cs" />
<Compile Include="Gui\Mono.Addins.Gui.ErrorDialog.cs" />
<Compile Include="Gui\Mono.Addins.Gui.InstallDialog.cs" />
<Compile Include="Gui\Mono.Addins.Gui.ManageSitesDialog.cs" />
<Compile Include="Gui\Mono.Addins.Gui.NewSiteDialog.cs" />
<Compile Include="Gui\Mono.Addins.Gui.ProgressDialog.cs" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="icons\package-x-generic.png">
<LogicalName>package-x-generic.png</LogicalName>
Expand Down Expand Up @@ -380,8 +342,4 @@
<LogicalName>web-search-16~dark@2x.png</LogicalName>
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
<Folder Include="Gui\" />
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
</Project>
47 changes: 0 additions & 47 deletions Mono.Addins.GuiGtk3/AssemblyInfo.cs
View file
Open in desktop

This file was deleted.

32 changes: 3 additions & 29 deletions Mono.Addins.GuiGtk3/Mono.Addins.GuiGtk3.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="..\TargetFrameworks.props" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
Expand All @@ -12,6 +12,7 @@
<AssemblyName>Mono.Addins.GuiGtk3</AssemblyName>
<SignAssembly>True</SignAssembly>
<AssemblyOriginatorKeyFile>..\mono-addins.snk</AssemblyOriginatorKeyFile>
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>True</DebugSymbols>
Expand All @@ -37,35 +38,9 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="gtk-sharp, Version=3.0.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
<Reference Include="gdk-sharp, Version=3.0.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
<Reference Include="glib-sharp, Version=3.0.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
<Reference Include="pango-sharp, Version=3.0.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
<Reference Include="atk-sharp, Version=3.0.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
<Reference Include="System.Core" />
<Reference Include="cairo-sharp, Version=1.10.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />
<Reference Include="Mono.Posix" />
<Reference Include="gio-sharp, Version=3.0.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
</ItemGroup>
<ItemGroup>
<Compile Include="AssemblyInfo.cs" />
<Compile Include="Mono.Addins.Gui\AddinInfoView.cs" />
<Compile Include="Mono.Addins.Gui\AddinInstaller.cs" />
<Compile Include="Mono.Addins.Gui\AddinInstallerDialog.cs" />
<Compile Include="Mono.Addins.Gui\AddinManagerDialog.cs" />
<Compile Include="Mono.Addins.Gui\AddinManagerWindow.cs" />
<Compile Include="Mono.Addins.Gui\AddinTreeWidget.cs" />
<Compile Include="Mono.Addins.Gui\ErrorDialog.cs" />
<Compile Include="Mono.Addins.Gui\HeaderBox.cs" />
<Compile Include="Mono.Addins.Gui\HoverImageButton.cs" />
<Compile Include="Mono.Addins.Gui\HslColor.cs" />
<Compile Include="Mono.Addins.Gui\InstallDialog.cs" />
<Compile Include="Mono.Addins.Gui\InstallMonitor.cs" />
<Compile Include="Mono.Addins.Gui\ManageSitesDialog.cs" />
<Compile Include="Mono.Addins.Gui\NewSiteDialog.cs" />
<Compile Include="Mono.Addins.Gui\ProgressDialog.cs" />
<Compile Include="Mono.Addins.Gui\SearchEntry.cs" />
<Compile Include="Mono.Addins.Gui\Services.cs" />
<PackageReference Include="GtkSharp" Version="3.22.25.128" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="icons\download-16.png">
Expand Down Expand Up @@ -381,7 +356,6 @@
<LogicalName>Mono.Addins.GuiGtk3.interfaces.ErrorDialog.ui</LogicalName>
</EmbeddedResource>
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<ItemGroup>
<ProjectReference Include="..\Mono.Addins.Setup\Mono.Addins.Setup.csproj">
<Project>{A85C9721-C054-4BD8-A1F3-0227615F0A36}</Project>
Expand Down
51 changes: 0 additions & 51 deletions Mono.Addins.MSBuild/AssemblyInfo.cs
View file
Open in desktop

This file was deleted.

29 changes: 6 additions & 23 deletions Mono.Addins.MSBuild/Mono.Addins.MSBuild.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +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="..\TargetFrameworks.props" />
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>8.0.30703</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{B4B44F14-32C3-4D50-8C6A-06AA30E56CA3}</ProjectGuid>
Expand All @@ -12,6 +9,9 @@
<RootNamespace>Mono.Addins.MSBuild</RootNamespace>
<SignAssembly>True</SignAssembly>
<AssemblyOriginatorKeyFile>..\mono-addins.snk</AssemblyOriginatorKeyFile>
<TargetFramework>netstandard2.0</TargetFramework>
<AssemblyVersion>1.0.0.0</AssemblyVersion>
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>True</DebugSymbols>
Expand All @@ -33,29 +33,12 @@
<DebugSymbols>true</DebugSymbols>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="Microsoft.Build.Framework" />
<Reference Include="Microsoft.Build.Utilities.v4.0" />
</ItemGroup>
<ItemGroup>
<Compile Include="AssemblyInfo.cs" />
<Compile Include="ResolveAddinReferences.cs" />
<Compile Include="Util.cs" />
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<ItemGroup>
<ProjectReference Include="..\Mono.Addins.Setup\Mono.Addins.Setup.csproj">
<Project>{A85C9721-C054-4BD8-A1F3-0227615F0A36}</Project>
<Name>Mono.Addins.Setup</Name>
<Private>False</Private>
</ProjectReference>
<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">
<Project>{91DD5A2D-9FE3-4C3C-9253-876141874DAD}</Project>
<Name>Mono.Addins</Name>
<Private>False</Private>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<None Include="Mono.Addins.targets" />
</ItemGroup>
</Project>
Loading