Skip to content

Addin 5.10.2.1 #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sushihangover merged 3 commits into from
Jan 2, 2016
Merged

Addin 5.10.2.1 #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4de4553
PlayScript.MSBuild 5.10.2.3
sushihangover Jan 2, 2016
8ef275d
Fix nuget release notes
sushihangover Jan 2, 2016
dccb444
Addin 5.10.2.1
sushihangover Jan 2, 2016
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
2 changes: 2 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,5 @@ obj
# Uncomment if necessary however generally it will be regenerated when needed
#!**/packages/repositories.config

*/build/PlayScript.MSBuild.Tasks.dll

12 changes: 12 additions & 0 deletions PlayScript.Addin.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mono.Cecil", "external\ceci
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Decompiler", "..\monodevelop\main\contrib\ICSharpCode.Decompiler\ICSharpCode.Decompiler.csproj", "{984CC812-9470-4A13-AFF9-CC44068D666C}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PlayScript.MSBuild.Tasks", "PlayScript.MSBuild.Tasks\PlayScript.MSBuild.Tasks.csproj", "{BA27E73E-B4F4-48B6-937E-E48D59ADD839}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PlayScript.MSBuild.Tasks.Test", "PlayScript.MSBuild.Tasks.Test\PlayScript.MSBuild.Tasks.Test.csproj", "{5A10410E-0971-40D6-8135-EC5F77B8630A}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -67,6 +71,10 @@ Global
{53DCA265-3C3C-42F9-B647-F72BA678122B}.Debug|Any CPU.Build.0 = Debug|Any CPU
{53DCA265-3C3C-42F9-B647-F72BA678122B}.Release|Any CPU.ActiveCfg = Release|Any CPU
{53DCA265-3C3C-42F9-B647-F72BA678122B}.Release|Any CPU.Build.0 = Release|Any CPU
{5A10410E-0971-40D6-8135-EC5F77B8630A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{5A10410E-0971-40D6-8135-EC5F77B8630A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{5A10410E-0971-40D6-8135-EC5F77B8630A}.Release|Any CPU.ActiveCfg = Release|Any CPU
{5A10410E-0971-40D6-8135-EC5F77B8630A}.Release|Any CPU.Build.0 = Release|Any CPU
{6FBE63EB-4D01-4BED-BC3E-F4AB31AB7D6F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{6FBE63EB-4D01-4BED-BC3E-F4AB31AB7D6F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{6FBE63EB-4D01-4BED-BC3E-F4AB31AB7D6F}.Release|Any CPU.ActiveCfg = Release|Any CPU
Expand All @@ -79,6 +87,10 @@ Global
{B1AF7070-8E25-4117-A441-14684219F4FD}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B1AF7070-8E25-4117-A441-14684219F4FD}.Release|Any CPU.ActiveCfg = Release|Any CPU
{B1AF7070-8E25-4117-A441-14684219F4FD}.Release|Any CPU.Build.0 = Release|Any CPU
{BA27E73E-B4F4-48B6-937E-E48D59ADD839}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{BA27E73E-B4F4-48B6-937E-E48D59ADD839}.Debug|Any CPU.Build.0 = Debug|Any CPU
{BA27E73E-B4F4-48B6-937E-E48D59ADD839}.Release|Any CPU.ActiveCfg = Release|Any CPU
{BA27E73E-B4F4-48B6-937E-E48D59ADD839}.Release|Any CPU.Build.0 = Release|Any CPU
{D68133BD-1E63-496E-9EDE-4FBDBF77B486}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{D68133BD-1E63-496E-9EDE-4FBDBF77B486}.Debug|Any CPU.Build.0 = Debug|Any CPU
{D68133BD-1E63-496E-9EDE-4FBDBF77B486}.Release|Any CPU.ActiveCfg = Release|Any CPU
Expand Down
16 changes: 16 additions & 0 deletions PlayScript.Addin/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
CONFIG?=Debug

all:
xbuild /p:Configuration=${CONFIG} ${ARGS}

clean:
xbuild /t:Clean ${ARGS}

# Clean does not always really clean, so clean hard ;-)
cleanhard:
find . -name "obj" -print0 | xargs -0 -n 1 rm -Rf
find . -name "bin" -print0 | xargs -0 -n 1 rm -Rf

install:
xbuild /p:InstallAddin=True /p:Configuration=${CONFIG} ${ARGS}

9 changes: 9 additions & 0 deletions PlayScript.Addin/MonoDevelop.PlayScript/Consts.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
using System;

namespace PlayScript
{
public static class Addin
{
public const string Version = MonoDevelop.BuildInfo.Version + ".1";
}
}
3 changes: 1 addition & 2 deletions PlayScript.Addin/PlayScript.Addin.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,6 +210,7 @@
<Compile Include="MonoDevelop.PlayScript.Resolver\HelperMethods.cs" />
<Compile Include="MonoDevelop.PlayScript.Tooltips\LanguageItemTooltipProvider.cs" />
<Compile Include="MonoDevelop.PlayScript\PlayScriptBindingCompilerManager.cs" />
<Compile Include="MonoDevelop.PlayScript\Consts.cs" />
</ItemGroup>
<ItemGroup>
<None Include="icons\actionscript-file-source-32%402x.psd" />
Expand All @@ -221,8 +222,6 @@
<None Include="MonoDevelop.PlayScript.Refactoring.CodeActions\Actions\ConvertToEnumDialog.cs" />
<None Include="MonoDevelop.PlayScript.Refactoring.CodeActions\Actions\MoveTypeToFile.cs" />
<None Include="MonoDevelop.PlayScript.UnitTests\UnitTestTextEditorExtension.cs" />
<None Include="MSBuild.Targets\Microsoft.Common.targets" />
<None Include="MSBuild.Targets\PlayScript.Targets" />
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.Targets" />
<Import Project="..\PlayScript.Addin\packages\MonoDevelop.Addins.0.3.0\build\net40\MonoDevelop.Addins.targets" Condition="Exists('..\PlayScript.Addin\packages\MonoDevelop.Addins.0.3.0\build\net40\MonoDevelop.Addins.targets')" />
Expand Down
8 changes: 4 additions & 4 deletions PlayScript.Addin/Properties/Manifest.addin.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,10 @@
<LanguageBinding id="ActionScript" supportedextensions=".as" class="MonoDevelop.PlayScript.ActionScriptLanguageBinding" />
<LanguageBinding id="PlayScript" supportedextensions=".play" class="MonoDevelop.PlayScript.PlayScriptLanguageBinding" />
</Extension>
<Extension path="/MonoDevelop/ProjectModel/MSBuildItemTypes">
<!-- <Extension path="/MonoDevelop/ProjectModel/MSBuildItemTypes">
<DotNetProject language="PlayScript" extension="psproj" guid="{464403d2-eb41-442a-a1f1-9bf858b8865f}" import="$(PsBuildBinPath)\PlayScript.Targets" resourceHandler="MonoDevelop.PlayScript.Project.CSharpresourceIdBuilder" />
<DotNetProject language="ActionScript" extension="asproj" guid="{496fe5ed-847f-4824-ad86-a92108ffcf0}" import="$(PsBuildBinPath)\PlayScript.Targets" resourceHandler="MonoDevelop.PlayScript.Project.CSharpResourceIdBuilder" />
</Extension>
</Extension>-->
<!-- <DotNetProjectSubtype guid="{1fc382b4-0f88-4dbe-994d-7aa7d07975c6}" type="MonoDevelop.AddinMaker.AddinProject" useXBuild="true" requireXbuild="false" />-->
<Extension path="/MonoDevelop/ProjectModel/Gui/ItemOptionPanels/Build/General">
<Condition id="ActiveLanguage" value="PlayScript">
Expand Down Expand Up @@ -188,12 +188,12 @@
macShortcut = "Meta|I" />
</Extension>-->

<!-- import="$(PsBuildBinPath)\PlayScript.Targets"-->
<Extension path = "/MonoDevelop/ProjectModel/MSBuildItemTypes">
<DotNetProject
language="PlayScript"
extension="psproj"
guid="{464403d2-eb41-442a-a1f1-9bf858b8865f}"
import="$(PsBuildBinPath)\PlayScript.Targets"
resourceHandler="MonoDevelop.PlayScript.Project.CSharpResourceIdBuilder"
/>
<!-- <Condition id="MSBuildTargetIsAvailable" target="$(PsBuildBinPath)\PlayScript.Portable.Targets">
Expand All @@ -207,12 +207,12 @@
</Condition>-->
</Extension>
<!--No portable libs for ActionScript, only PlayScript-->
<!-- import="$(PsBuildBinPath)\PlayScript.Targets"-->
<Extension path = "/MonoDevelop/ProjectModel/MSBuildItemTypes">
<DotNetProject
language="PlayScript"
extension="asproj"
guid="{496fe5ed-847f-4824-ad86-a92108ffcf0f}"
import="$(PsBuildBinPath)\PlayScript.Targets"
resourceHandler="MonoDevelop.PlayScript.Project.CSharpResourceIdBuilder"
/>
</Extension>
Expand Down
3 changes: 2 additions & 1 deletion PlayScript.Addin/Properties/PlayScript.AddinInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
using System;
using Mono.Addins;
using Mono.Addins.Description;
using PlayScript;

[assembly:Addin (
"PlayScript",
Namespace = "MonoDevelop",
Version = MonoDevelop.BuildInfo.Version,
Version = PlayScript.Addin.Version,
Flags = AddinFlags.None,
Category = "Language bindings",
Url = "https://github.com/PlayScriptRedux/PlayScript.Addin"
Expand Down
6 changes: 4 additions & 2 deletions PlayScript.Addin/templates/AsConsoleProject.xpt.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,11 @@
<Options ExternalConsole="True" />
<References>
<Reference type="Package" refto="System" LocalCopy="false" SpecificVersion="true" />
<Reference type="Package" refto="pscorlib_aot" LocalCopy="true" SpecificVersion="false" />
<Reference type="Package" refto="PlayScript.Dynamic_aot" LocalCopy="true" SpecificVersion="false" />
</References>
<Packages>
<Package id="PlayScript.AOT" />
<package id="PlayScript.MSBuild" />
</Packages>
<Files>
<File name="Main.as" AddStandardHeader="True"><![CDATA[package
{
Expand Down
6 changes: 4 additions & 2 deletions PlayScript.Addin/templates/AsEmptyProject.xpt.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,11 @@
<Project name="${ProjectName}" directory=".">
<References>
<Reference type="Package" refto="System" LocalCopy="false" SpecificVersion="true" />
<Reference type="Package" refto="pscorlib_aot" LocalCopy="true" SpecificVersion="false" />
<Reference type="Package" refto="PlayScript.Dynamic_aot" LocalCopy="true" SpecificVersion="false" />
</References>
<Packages>
<Package id="PlayScript.AOT" />
<package id="PlayScript.MSBuild" />
</Packages>
</Project>
</Combine>
</Template>
6 changes: 4 additions & 2 deletions PlayScript.Addin/templates/AsLibrary.xpt.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,11 @@
<Options Target="Library" PauseConsoleOutput="False" />
<References>
<Reference type="Package" refto="System" LocalCopy="false" SpecificVersion="true" />
<Reference type="Package" refto="pscorlib_aot" LocalCopy="true" SpecificVersion="false" />
<Reference type="Package" refto="PlayScript.Dynamic_aot" LocalCopy="true" SpecificVersion="false" />
</References>
<Packages>
<Package id="PlayScript.AOT" />
<package id="PlayScript.MSBuild" />
</Packages>
<Files>
<FileTemplateReference TemplateID="PlayScriptEmptyClass" name="MyClass.as" />
<FileTemplateReference TemplateID="CSharpAssemblyInfo" name="AssemblyInfo.cs" />
Expand Down
6 changes: 4 additions & 2 deletions PlayScript.Addin/templates/PsConsoleProject.xpt.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,11 @@
<Options ExternalConsole="True" />
<References>
<Reference type="Package" refto="System" LocalCopy="false" SpecificVersion="true" />
<Reference type="Package" refto="pscorlib_aot" LocalCopy="true" SpecificVersion="false" />
<Reference type="Package" refto="PlayScript.Dynamic_aot" LocalCopy="true" SpecificVersion="false" />
</References>
<Packages>
<Package id="PlayScript.AOT" />
<package id="PlayScript.MSBuild" />
</Packages>
<Files>
<File name="Main.play" AddStandardHeader="True"><![CDATA[package
{
Expand Down
6 changes: 4 additions & 2 deletions PlayScript.Addin/templates/PsEmptyProject.xpt.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,11 @@
<Project name="${ProjectName}" directory=".">
<References>
<Reference type="Package" refto="System" LocalCopy="false" SpecificVersion="true" />
<Reference type="Package" refto="pscorlib_aot" LocalCopy="true" SpecificVersion="false" />
<Reference type="Package" refto="PlayScript.Dynamic_aot" LocalCopy="true" SpecificVersion="false" />
</References>
<Packages>
<Package id="PlayScript.AOT" />
<package id="PlayScript.MSBuild" />
</Packages>
</Project>
</Combine>
</Template>
6 changes: 4 additions & 2 deletions PlayScript.Addin/templates/PsLibrary.xpt.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,11 @@
<Options Target="Library" PauseConsoleOutput="False" />
<References>
<Reference type="Package" refto="System" />
<Reference type="Package" refto="pscorlib_aot" LocalCopy="true" SpecificVersion="false" />
<Reference type="Package" refto="PlayScript.Dynamic_aot" LocalCopy="true" SpecificVersion="false" />
</References>
<Packages>
<Package id="PlayScript.AOT" />
<package id="PlayScript.MSBuild" />
</Packages>
<Files>
<FileTemplateReference TemplateID="PlayScriptEmptyClass" name="MyClass.play" />
<FileTemplateReference TemplateID="CSharpAssemblyInfo" name="AssemblyInfo.cs" />
Expand Down
14 changes: 11 additions & 3 deletions PlayScript.MSBuild.Targets.Nuget/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,18 @@
CONFIG?=Debug

all:
nuget pack
all: task pack content

pack:
nuget pack

task:
cd ../PlayScript.MSBuild.Tasks; xbuild PlayScript.MSBuild.Tasks.csproj /property:Configuration=Release
cp ../PlayScript.MSBuild.Tasks/bin/Release/PlayScript.MSBuild.Tasks.dll build

clean:
rm PlayScript.MSBuild.*.nupkg
-rm PlayScript.MSBuild.*.nupkg
-cd ../PlayScript.MSBuild.Tasks; xbuild PlayScript.MSBuild.Tasks.csproj /target:Clean /property:Configuration=Release
-cd ../PlayScript.MSBuild.Tasks; xbuild PlayScript.MSBuild.Tasks.csproj /target:Clean /property:Configuration=Debug

publish: clean all
nuget push PlayScript.MSBuild.*.nupkg $(MyGetApiKey) -source https://www.myget.org/F/playscript/api/v2
Expand Down
5 changes: 4 additions & 1 deletion PlayScript.MSBuild.Targets.Nuget/PlayScript.MSBuild.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<package>
<metadata minClientVersion="2.8.5">
<id>PlayScript.MSBuild</id>
<version>5.10.2.2</version>
<version>5.10.2.3</version>
<authors>SushiHangover\RobertN</authors>
<owners>SushiHangover\RobertN</owners>
<projectUrl>https://github.com/PlayScriptRedux/PlayScript.Addin</projectUrl>
Expand All @@ -20,6 +20,7 @@
<releaseNotes>
PlayScript.MSBuild release notes:

5.10.2.3 Update : Add MsBuild properties debug target : /target=viewenv ; Add custom MSbuild Task to remove hardcoded paths to psc
5.10.2.2 Fix : Include build file (failing due to x-plat pathing)
5.10.2.1 Fix : Fix License and icon
5.10.2.0 New : Initial Public Release
Expand All @@ -31,6 +32,8 @@
<files>
<file src="LICENSE.md" target="LICENSE.md" />
<file src="build/PlayScript.MSBuild.Targets" target="build" />
<file src="build/PlayScript.MSBuild.Debug.Targets" target="build" />
<file src="build/PlayScript.MSBuild.Tasks.dll" target="build" />
<!--
<file src="tools/**\*.*" target="tools" />
-->
Expand Down
32 changes: 32 additions & 0 deletions PlayScript.MSBuild.Targets.Nuget/build/PlayScript.MSBuild.Debug.Targets
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

<!-- PlayScript -->
<Target Name="VIEWENV" DependsOnTargets="BeforeResolveReferences">
<Message Text=" CscToolExe: $(CscToolExe) "/>
<Message Text=" CscToolPath: $(CscToolPath) "/>
<Message Text=" ReferencePath: $(ReferencePath) "/>
<Message Text=" ToolsPath: $(ToolsPath) "/>
<Message Text=" TargetFrameworkDirectory: $(TargetFrameworkDirectory) "/>
<Message Text=" MSBuildThisFileDirectory: $(MSBuildThisFileDirectory) "/>
<Message Text=" MSBuildThisFileName: $(MSBuildThisFileName) "/>
<Message Text="(P# import) PsBuildBinPath: $(PsBuildBinPath) "/>
<Message Text="(C# import) MSBuildBinPath: $(ToolsPath) "/>
<Message Text="(F# import)) MSBuildExtensionsPath32: $(MSBuildExtensionsPath32) "/>
<Message Text="~"/>
<Message Text="PlayScript: "/>
<Message Text=" PlayScriptSDKPath: $(PlayScriptSDKPath) "/>
<Message Text=" PlayScriptCompiler: $(PlayScriptCompiler) "/>
<Message Text="~"/>
<Message Text="Xamarin.iOS: "/>
<Message Text=" MD_MTOUCH_SDK_ROOT: $(MD_MTOUCH_SDK_ROOT) "/>
<Message Text=" TargetFrameworkIdentifier: $(TargetFrameworkIdentifier) "/>
<Message Text=" Before.targets: $(MSBuildThisFileDirectory)$(MSBuildThisFileName).Before.targets "/>
<Message Text=" Before.props: $(MSBuildThisFileDirectory)$(MSBuildThisFileName).Before.props "/>
<Message Text=" After.targets: $(MSBuildThisFileDirectory)$(MSBuildThisFileName).After.targets "/>
<Message Text=" After.props: $(MSBuildThisFileDirectory)$(MSBuildThisFileName).After.props "/>
<Message Text=" AssemblySearchPaths: $(AssemblySearchPaths) "/>
</Target>
<!-- PlayScript -->

</Project>

Loading