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

Update to new MSBuild format in project files, for Netstandard2.0 #169

Merged
sandyarmstrong merged 5 commits into from
Dec 16, 2021
Merged

Update to new MSBuild format in project files, for Netstandard2.0 #169

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 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
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.

13 changes: 2 additions & 11 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,16 @@
<?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" />
<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>
<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>
<AssemblyVersion>1.0.0.0</AssemblyVersion>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>True</DebugSymbols>
Expand Down Expand Up @@ -49,9 +45,4 @@
<Name>Mono.Addins</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Compile Include="Mono.Addins.CecilReflector\Reflector.cs" />
<Compile Include="AssemblyInfo.cs" />
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
</Project>
45 changes: 2 additions & 43 deletions Mono.Addins.Gui/Mono.Addins.Gui.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,13 @@
<?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>
<AssemblyName>Mono.Addins.Gui</AssemblyName>
<SchemaVersion>2.0</SchemaVersion>
<RootNamespace>Mono.Addins.Gui</RootNamespace>
<SignAssembly>True</SignAssembly>
<AssemblyOriginatorKeyFile>..\mono-addins.snk</AssemblyOriginatorKeyFile>
<RestoreProjectStyle>PackageReference</RestoreProjectStyle>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
Expand Down Expand Up @@ -39,15 +35,11 @@
<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">
Expand All @@ -61,35 +53,6 @@
<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 +343,4 @@
<LogicalName>[email protected]</LogicalName>
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
<Folder Include="Gui\" />
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
</Project>
33 changes: 2 additions & 31 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 @@ -10,8 +10,6 @@
<OutputType>Library</OutputType>
<RootNamespace>Mono.Addins.GuiGtk3</RootNamespace>
<AssemblyName>Mono.Addins.GuiGtk3</AssemblyName>
<SignAssembly>True</SignAssembly>
<AssemblyOriginatorKeyFile>..\mono-addins.snk</AssemblyOriginatorKeyFile>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>True</DebugSymbols>
Expand All @@ -37,35 +35,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 +353,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.

27 changes: 5 additions & 22 deletions Mono.Addins.MSBuild/Mono.Addins.MSBuild.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,14 @@
<?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>
<OutputType>Library</OutputType>
<AssemblyName>Mono.Addins.MSBuild</AssemblyName>
<RootNamespace>Mono.Addins.MSBuild</RootNamespace>
<SignAssembly>True</SignAssembly>
<AssemblyOriginatorKeyFile>..\mono-addins.snk</AssemblyOriginatorKeyFile>
<TargetFramework>netstandard2.0</TargetFramework>
<AssemblyVersion>1.0.0.0</AssemblyVersion>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>True</DebugSymbols>
Expand All @@ -34,28 +31,14 @@
</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>
20 changes: 0 additions & 20 deletions Mono.Addins.Setup/AssemblyInfo.cs
View file
Open in desktop

This file was deleted.

47 changes: 3 additions & 44 deletions Mono.Addins.Setup/Mono.Addins.Setup.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,19 @@
<?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" />
<Import Project="..\Version.props" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{A85C9721-C054-4BD8-A1F3-0227615F0A36}</ProjectGuid>
<OutputType>Library</OutputType>
<AssemblyName>Mono.Addins.Setup</AssemblyName>
<RootNamespace>Mono.Addins.Setup</RootNamespace>
<SignAssembly>True</SignAssembly>
<AssemblyOriginatorKeyFile>..\mono-addins.snk</AssemblyOriginatorKeyFile>
<PackageId>Mono.Addins.Setup</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>
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
<AssemblyVersion>1.0.0.0</AssemblyVersion>
<TargetFramework>netstandard2.0</TargetFramework>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>True</DebugSymbols>
Expand Down Expand Up @@ -55,43 +53,4 @@
</ProjectReference>
<PackageReference Include="NuGet.Build.Packaging" Version="0.2.0" />
</ItemGroup>
<ItemGroup>
<Compile Include="Mono.Addins.Setup\AddinInfo.cs" />
<Compile Include="Mono.Addins.Setup\AddinInfoCollection.cs" />
<Compile Include="Mono.Addins.Setup\AddinPackage.cs" />
<Compile Include="Mono.Addins.Setup\AddinRepositoryEntry.cs" />
<Compile Include="Mono.Addins.Setup\AddinStore.cs" />
<Compile Include="Mono.Addins.Setup\AddinSystemConfiguration.cs" />
<Compile Include="Mono.Addins.Setup\AddinSystemConfigurationReaderWriter.cs" />
<Compile Include="Mono.Addins.Setup\AddinSystemConfigurationSerializer.cs" />
<Compile Include="Mono.Addins.Setup\InstallException.cs" />
<Compile Include="Mono.Addins.Setup\Package.cs" />
<Compile Include="Mono.Addins.Setup\PackageCollection.cs" />
<Compile Include="Mono.Addins.Setup\ReferenceRepositoryEntry.cs" />
<Compile Include="Mono.Addins.Setup\Repository.cs" />
<Compile Include="Mono.Addins.Setup\RepositoryEntry.cs" />
<Compile Include="Mono.Addins.Setup\RepositoryEntryCollection.cs" />
<Compile Include="Mono.Addins.Setup\RepositoryReaderWriter.cs" />
<Compile Include="Mono.Addins.Setup\RepositoryRecord.cs" />
<Compile Include="Mono.Addins.Setup\RepositorySerializer.cs" />
<Compile Include="Mono.Addins.Setup\SetupTool.cs" />
<Compile Include="Mono.Addins.Setup.ProgressMonitoring\ConsoleProgressMonitor.cs" />
<Compile Include="Mono.Addins.Setup.ProgressMonitoring\LogTextWriter.cs" />
<Compile Include="Mono.Addins.Setup.ProgressMonitoring\NullProgressMonitor.cs" />
<Compile Include="Mono.Addins.Setup.ProgressMonitoring\ProgressStatusMonitor.cs" />
<Compile Include="Mono.Addins.Setup.ProgressMonitoring\ProgressTracker.cs" />
<Compile Include="Mono.Addins.Setup\IProgressMonitor.cs" />
<Compile Include="Mono.Addins.Setup\RepositoryRegistry.cs" />
<Compile Include="Mono.Addins.Setup\SetupService.cs" />
<Compile Include="AssemblyInfo.cs" />
<Compile Include="Mono.Addins.Setup\ConsoleAddinInstaller.cs" />
<Compile Include="Mono.Addins.Setup\PcFileCache.cs" />
<Compile Include="Mono.Addins.Setup\TextFormatter.cs" />
<Compile Include="Mono.Addins.Setup\WebRequestHelper.cs" />
<Compile Include="Mono.Addins.Setup\AddinRepositoryProvider.cs" />
<Compile Include="Mono.Addins.Setup\MonoAddinsRepositoryProvider.cs" />
<Compile Include="Mono.Addins.Setup\HttpClientProvider.cs" />
<Compile Include="Mono.Addins.Setup\DownloadFileRequest.cs" />
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
</Project>
Loading