Skip to content

Commit 73c8b54

Browse files
v1.2 fixes issue #2
1 parent bd456a0 commit 73c8b54

File tree

7 files changed

+18
-70
lines changed

7 files changed

+18
-70
lines changed

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -288,3 +288,6 @@ fastlane/report.xml
288288
fastlane/Preview.html
289289
fastlane/screenshots
290290
fastlane/test_output
291+
292+
293+
.vs
Lines changed: 3 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,11 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="packages\MonoDevelop.Addins.0.3.14\build\net45\MonoDevelop.Addins.props" Condition="Exists('packages\MonoDevelop.Addins.0.3.14\build\net45\MonoDevelop.Addins.props')" />
1+
<Project Sdk="Microsoft.NET.Sdk">
42
<PropertyGroup>
5-
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
6-
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
7-
<ProjectGuid>{5F71166C-B9C9-4973-9CF0-5ACEAE6E49FD}</ProjectGuid>
8-
<ProjectTypeGuids>{86F6BF2A-E449-4B3E-813B-9ACC37E5545F};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
9-
<OutputType>Library</OutputType>
10-
<RootNamespace>DefaultDesigner</RootNamespace>
11-
<AssemblyName>DefaultDesigner</AssemblyName>
12-
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
3+
<TargetFramework>net461</TargetFramework>
134
</PropertyGroup>
14-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
15-
<DebugSymbols>true</DebugSymbols>
16-
<DebugType>full</DebugType>
17-
<Optimize>false</Optimize>
18-
<OutputPath>bin\Debug</OutputPath>
19-
<DefineConstants>DEBUG;</DefineConstants>
20-
<ErrorReport>prompt</ErrorReport>
21-
<WarningLevel>4</WarningLevel>
22-
</PropertyGroup>
23-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
24-
<Optimize>true</Optimize>
25-
<OutputPath>bin\Release</OutputPath>
26-
<ErrorReport>prompt</ErrorReport>
27-
<WarningLevel>4</WarningLevel>
28-
</PropertyGroup>
29-
<ItemGroup>
30-
<Compile Include="Properties\AssemblyInfo.cs" />
31-
<Compile Include="Properties\AddinInfo.cs" />
32-
</ItemGroup>
335
<ItemGroup>
34-
<EmbeddedResource Include="Properties\Manifest.addin.xml" />
6+
<PackageReference Include="MonoDevelop.Addins" Version="0.4.1" />
357
</ItemGroup>
368
<ItemGroup>
379
<AddinReference Include="MonoDevelop.MacDev" />
3810
</ItemGroup>
39-
<ItemGroup>
40-
<None Include="packages.config" />
41-
</ItemGroup>
42-
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
43-
<Import Project="packages\MonoDevelop.Addins.0.3.14\build\net45\MonoDevelop.Addins.targets" Condition="Exists('packages\MonoDevelop.Addins.0.3.14\build\net45\MonoDevelop.Addins.targets')" />
4411
</Project>

DefaultDesigner/Properties/AddinInfo.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
[assembly: Addin (
66
"DefaultDesigner",
77
Namespace = "DefaultDesigner",
8-
Version = "1.2"
8+
Version = "1.3"
99
)]
1010

1111
[assembly: AddinName ("Default Designer")]

DefaultDesigner/Properties/AssemblyInfo.cs

Lines changed: 0 additions & 26 deletions
This file was deleted.

DefaultDesigner/Properties/Manifest.addin.xml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,11 @@
77
id="InterfaceBuilderBeforeIPhoneDesinger"
88
insertbefore="IPhoneDesigner" />
99
</Extension>
10+
<Extension
11+
path="/MonoDevelop/Ide/DisplayBindings">
12+
<DisplayBinding
13+
class="MonoDevelop.MacDev.XcodeInterfaceBuilderDisplayBinding"
14+
id="InterfaceBuilderBeforeIOSDesinger"
15+
insertbefore="iOSDesigner" />
16+
</Extension>
1017
</ExtensionModel>

DefaultDesigner/packages.config

Lines changed: 0 additions & 4 deletions
This file was deleted.

Makefile

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
CONFIGURATION=Release
22

3+
ADDIN_PROFILE=net461
34
ADDIN_NAME=DefaultDesigner
45

56
VSTOOL ?= /Applications/Visual\ Studio.app/Contents/MacOS/vstool
@@ -12,12 +13,12 @@ Build/$(CONFIGURATION) :
1213

1314
Build/$(CONFIGURATION)/$(ADDIN_NAME).dll : Build/$(CONFIGURATION)
1415
cd $(ADDIN_NAME) && msbuild /p:Configuration=$(CONFIGURATION)
15-
cp $(ADDIN_NAME)/bin/$(CONFIGURATION)/$(ADDIN_NAME).dll Build/$(CONFIGURATION)
16+
cp $(ADDIN_NAME)/bin/$(CONFIGURATION)/$(ADDIN_PROFILE)/$(ADDIN_NAME).dll Build/$(CONFIGURATION)
1617

1718
Build/$(CONFIGURATION)/$(ADDIN_NAME).mpack : Build/$(CONFIGURATION)/$(ADDIN_NAME).dll
1819
cd Build/$(CONFIGURATION) && $(VSTOOL) setup pack $(ADDIN_NAME).dll
1920

2021
clean :
2122
rm -rf Build
22-
rm -rf $(ADDIN_NAME)/bin
23-
rm -rf $(ADDIN_NAME)/obj
23+
#rm -rf $(ADDIN_NAME)/bin
24+
#rm -rf $(ADDIN_NAME)/obj

0 commit comments

Comments
 (0)