Permalink
Browse files

Merge branch 'master' into cc

  • Loading branch information...
nikhilk committed Jul 29, 2012
2 parents 98d391f + d991176 commit 81dabab0a85dc3ad645f73ff4300fa92ee1154b8
Showing 523 changed files with 3,454 additions and 18,733 deletions.
View
@@ -5,3 +5,4 @@ obj/
*.cache
*.trx
Scripts/
+packages/
View
@@ -1,4 +1,7 @@
-
+ Script# Project
+ Copyright 2012, Script# Project
+ Copyright 2012, Nikhil Kothari
+
Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/
@@ -36,8 +39,7 @@
"Work" shall mean the work of authorship, whether in Source or
Object form, made available under the License, as indicated by a
- copyright notice that is included in or attached to the work
- (an example is provided in the Appendix below).
+ copyright notice that is included in or attached to the work.
"Derivative Works" shall mean any work, whether in Source or Object
form, that is based on (or derived from) the Work and for which the
@@ -105,20 +107,20 @@
excluding those notices that do not pertain to any part of
the Derivative Works; and
- (d) If the Work includes a "NOTICE" text file as part of its
+ (d) If the Work includes a "License.txt" text file as part of its
distribution, then any Derivative Works that You distribute must
include a readable copy of the attribution notices contained
- within such NOTICE file, excluding those notices that do not
+ within such License.txt file, excluding those notices that do not
pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
+ of the following places: within a License.txt text file distributed
as part of the Derivative Works; within the Source form or
documentation, if provided along with the Derivative Works; or,
within a display generated by the Derivative Works, if and
wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
+ of the License.txt file are for informational purposes only and
do not modify the License. You may add Your own attribution
notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
+ or as an addendum to the License.txt text from the Work, provided
that such additional attribution notices cannot be construed
as modifying the License.
View
@@ -0,0 +1,13 @@
+Script# Project
+Copyright 2012, Script# Project
+Copyright 2012, Nikhil Kothari
+
+Script# is licensed under the Apache License v2.0 (see License.txt).
+Script# also includes works distributed under the licenses listed below.
+
+Mono Cecil
+--------------
+Website: https://github.com/jbevain/cecil
+Copyright: Copyright (c) 2008 - 2011 Jb Evain
+License: The MIT License
+ http://opensource.org/licenses/mit-license.php
View
@@ -1,27 +0,0 @@
-@echo off
-
-REM This script cleans up what setup.bat does.
-REM It must be run within an Administrator command prompt.
-
-@echo Cleaning GAC entries...
-gacutil /nologo /uf ScriptSharp
-gacutil /nologo /uf ScriptSharp.Build
-gacutil /nologo /uf ScriptSharp.Testing
-gacutil /nologo /uf ScriptSharp.VisualStudio
-
-set InstallDir=%ProgramFiles(x86)%
-if "%InstallDir%" == "" set InstallDir=%ProgramFiles%
-
-@echo Removing script# folder...
-rd /s /q "%InstallDir%\ScriptSharp\v1.0"
-
-if "%1" neq "includeTemplates" goto Done
-
-:Templates
-@echo Cleaning up templates...
-set IDEDir="%VSINSTALLDIR%"\Common7\IDE
-rd /s /q "%IDEDir%"\ProjectTemplates\CSharp\Script#
-rd /s /q "%IDEDir%"\ItemTemplates\CSharp\Script#
-%IDEDir%\devenv.exe /installvstemplates
-
-:Done
View
@@ -1,86 +0,0 @@
-@echo off
-
-REM This script installs a script# build (over what the msi installs)
-REM It must be run within an Administrator command prompt.
-
-set InstallDir=%ProgramFiles(x86)%
-if "%InstallDir%" == "" set InstallDir=%ProgramFiles%
-
-mkdir "%InstallDir%\ScriptSharp\v1.0\Framework"
-mkdir "%InstallDir%\ScriptSharp\v1.0\CodeAnalysis"
-
-@echo Copying binaries...
-copy /y Debug\ssc.exe "%InstallDir%\ScriptSharp\v1.0"
-copy /y Debug\sspp.exe "%InstallDir%\ScriptSharp\v1.0"
-copy /y Debug\ScriptSharp.dll "%InstallDir%\ScriptSharp\v1.0"
-copy /y Debug\ScriptSharp.Build.dll "%InstallDir%\ScriptSharp\v1.0"
-copy /y Debug\ScriptSharp.Testing.dll "%InstallDir%\ScriptSharp\v1.0"
-copy /y Debug\ScriptSharp.VisualStudio.dll "%InstallDir%\ScriptSharp\v1.0"
-copy /y Debug\ScriptSharp.FxCop.dll "%InstallDir%\ScriptSharp\v1.0\CodeAnalysis"
-copy /y Debug\ScriptSharp.targets "%InstallDir%\ScriptSharp\v1.0"
-
-@echo Adding GAC entries...
-gacutil /nologo /if "%InstallDir%\ScriptSharp\v1.0\ScriptSharp.dll
-gacutil /nologo /if "%InstallDir%\ScriptSharp\v1.0\ScriptSharp.Build.dll
-gacutil /nologo /if "%InstallDir%\ScriptSharp\v1.0\ScriptSharp.Testing.dll"
-gacutil /nologo /if "%InstallDir%\ScriptSharp\v1.0\ScriptSharp.VisualStudio.dll"
-
-@echo Copying scripts...
-copy /y ref\mscorlib.js "%InstallDir%\ScriptSharp\v1.0\Framework"
-copy /y ref\mscorlib.debug.js "%InstallDir%\ScriptSharp\v1.0\Framework"
-
-@echo Copying assemblies...
-copy /y Debug\mscorlib.dll "%InstallDir%\ScriptSharp\v1.0\Framework"
-copy /y Debug\mscorlib.xml "%InstallDir%\ScriptSharp\v1.0\Framework"
-copy /y Debug\Script.Web.dll "%InstallDir%\ScriptSharp\v1.0\Framework"
-copy /y Debug\Script.Web.xml "%InstallDir%\ScriptSharp\v1.0\Framework"
-copy /y Debug\Script.Windows.dll "%InstallDir%\ScriptSharp\v1.0\Framework"
-copy /y Debug\Script.Windows.xml "%InstallDir%\ScriptSharp\v1.0\Framework"
-copy /y Debug\Script.jQuery.dll "%InstallDir%\ScriptSharp\v1.0\Framework"
-copy /y Debug\Script.jQuery.xml "%InstallDir%\ScriptSharp\v1.0\Framework"
-copy /y Debug\Script.jQuery.txt "%InstallDir%\ScriptSharp\v1.0\Framework"
-copy /y Debug\Script.jQuery.UI.dll "%InstallDir%\ScriptSharp\v1.0\Framework"
-copy /y Debug\Script.jQuery.UI.xml "%InstallDir%\ScriptSharp\v1.0\Framework"
-copy /y Debug\Script.jQuery.UI.txt "%InstallDir%\ScriptSharp\v1.0\Framework"
-copy /y Debug\Script.jQuery.History.dll "%InstallDir%\ScriptSharp\v1.0\Framework"
-copy /y Debug\Script.jQuery.History.xml "%InstallDir%\ScriptSharp\v1.0\Framework"
-copy /y Debug\Script.jQuery.History.txt "%InstallDir%\ScriptSharp\v1.0\Framework"
-copy /y Debug\Script.jQuery.Templating.dll "%InstallDir%\ScriptSharp\v1.0\Framework"
-copy /y Debug\Script.jQuery.Templating.xml "%InstallDir%\ScriptSharp\v1.0\Framework"
-copy /y Debug\Script.jQuery.Templating.txt "%InstallDir%\ScriptSharp\v1.0\Framework"
-copy /y Debug\Script.jQuery.Validation.dll "%InstallDir%\ScriptSharp\v1.0\Framework"
-copy /y Debug\Script.jQuery.Validation.xml "%InstallDir%\ScriptSharp\v1.0\Framework"
-copy /y Debug\Script.jQuery.Validation.txt "%InstallDir%\ScriptSharp\v1.0\Framework"
-copy /y Debug\Script.Knockout.dll "%InstallDir%\ScriptSharp\v1.0\Framework"
-copy /y Debug\Script.Knockout.xml "%InstallDir%\ScriptSharp\v1.0\Framework"
-copy /y Debug\Script.Knockout.txt "%InstallDir%\ScriptSharp\v1.0\Framework"
-copy /y Debug\Script.Microsoft.BingMaps.dll "%InstallDir%\ScriptSharp\v1.0\Framework"
-copy /y Debug\Script.Microsoft.BingMaps.xml "%InstallDir%\ScriptSharp\v1.0\Framework"
-copy /y Debug\Script.Microsoft.BingMaps.txt "%InstallDir%\ScriptSharp\v1.0\Framework"
-copy /y Debug\Script.Sharpen.Framework.dll "%InstallDir%\ScriptSharp\v1.0\Framework"
-copy /y Debug\Script.Sharpen.Framework.xml "%InstallDir%\ScriptSharp\v1.0\Framework"
-
-if "%1" neq "includeTemplates" goto Done
-
-:Templates
-@echo Setting up templates...
-set IDEDir="%VSINSTALLDIR%"Common7\IDE
-mkdir "%IDEDir%"\ProjectTemplates\CSharp\Script#
-mkdir "%IDEDir%"\ItemTemplates\CSharp\Script#
-copy /y Debug\Templates\Script#.VSTDIR %IDEDir%\ProjectTemplates\CSharp\Script#
-copy /y Debug\Templates\ProjectTemplates\ClassLibrary.zip %IDEDir%\ProjectTemplates\CSharp\Script#
-copy /y Debug\Templates\ProjectTemplates\jQueryClassLibrary.zip %IDEDir%\ProjectTemplates\CSharp\Script#
-copy /y Debug\Templates\ProjectTemplates\Gadget.zip %IDEDir%\ProjectTemplates\CSharp\Script#
-copy /y Debug\Templates\ProjectTemplates\UnitTest.zip %IDEDir%\ProjectTemplates\CSharp\Script#
-copy /y Debug\Templates\ProjectTemplates\ImportLibrary.zip %IDEDir%\ProjectTemplates\CSharp\Script#
-copy /y Debug\Templates\Script#.VSTDIR %IDEDir%\ItemTemplates\CSharp\Script#
-copy /y Debug\Templates\ItemTemplates\Class.zip %IDEDir%\ItemTemplates\CSharp\Script#
-copy /y Debug\Templates\ItemTemplates\Page.zip %IDEDir%\ItemTemplates\CSharp\Script#
-copy /y Debug\Templates\ItemTemplates\jQueryPage.zip %IDEDir%\ItemTemplates\CSharp\Script#
-copy /y Debug\Templates\ItemTemplates\jQueryPlugin.zip %IDEDir%\ItemTemplates\CSharp\Script#
-copy /y Debug\Templates\ItemTemplates\Resource.zip %IDEDir%\ItemTemplates\CSharp\Script#
-copy /y Debug\Templates\ItemTemplates\Scriptlet.zip %IDEDir%\ItemTemplates\CSharp\Script#
-copy /y Debug\Templates\ItemTemplates\TestClass.zip %IDEDir%\ItemTemplates\CSharp\Script#
-%IDEDir%\devenv.exe /installvstemplates
-
-:Done
View
@@ -26,6 +26,19 @@ v0.7.5.0 [in progress]
- [git #187] Support for writing 'new Image()'
- [git #189] Fixed jQuery.when metadata
- [git #201] Strongly typed some Knockout API (KnockoutMapping)
+ - Nuget packages for compiler, and individual import libraries
+ - VSIX-based approach for getting script# and associated templates
+ - Breaking changes:
+ - In a csproj, the TemplateFile property has been changed to ScriptTemplate
+ - When creating a project there is no prompt to setup a DeploymentPath
+ ... but for now, msbuild support continues to exist (via manual edit)
+ ... will potentially be replaced eventually.
+ - No more support for WebAppParitioning. If you were compiling multiple script
+ files out of a single c# project, this feature is gone. You can switch your
+ msbuild scripts to use the ScriptCompilerExecTask, instead of ScriptCompilerTask
+ and invoke the compiler multiple times for each script file, passing in exactly
+ the right set of sources for each script file to be generated.
+ - Removed Script.Windows.dll and gadget project
v0.7.4.0
- Fix/update bing maps metadata bug
View
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
@@ -1,4 +0,0 @@
-MSBuild Community Tasks
-
-http://msbuildtasks.tigris.org/
-v1.2.0.306
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
@@ -1,36 +1,41 @@

-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AroundMeWeb", "AroundMeWeb\AroundMeWeb.csproj", "{B190181B-16F9-40A8-B431-2D80DE63D081}"
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 2012
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AroundMe", "AroundMe\AroundMe.csproj", "{C1AFF814-2C3A-4D04-88A4-5CF10D07AA56}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AroundMe", "AroundMe\AroundMe.csproj", "{DFF9B9D5-5CE0-448E-ADAF-47E26A72017E}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Twitter", "Twitter\Twitter.csproj", "{476312F9-5403-4C3A-848A-0F31213FC72E}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AroundMeTests", "AroundMeTests\AroundMeTests.csproj", "{1A55F098-B1B4-41BC-93F7-EE89A85B0AF6}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MapDemo", "MapDemo\MapDemo.csproj", "{2176DBB5-D8FD-493C-B896-59E7283E7127}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Twitter", "Twitter\Twitter.csproj", "{135E07CB-462D-4014-BD74-FF565C60A46D}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AroundMeTests", "AroundMeTests\AroundMeTests.csproj", "{E01AE039-4B10-4A3B-AB86-EBFC1E2F6B17}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{F9ED6BAF-639F-4F4B-8E04-C6AE7EAE860A}"
+ ProjectSection(SolutionItems) = preProject
+ AroundMeTests.testsettings = AroundMeTests.testsettings
+ EndProjectSection
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {B190181B-16F9-40A8-B431-2D80DE63D081}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {B190181B-16F9-40A8-B431-2D80DE63D081}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {B190181B-16F9-40A8-B431-2D80DE63D081}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {B190181B-16F9-40A8-B431-2D80DE63D081}.Release|Any CPU.Build.0 = Release|Any CPU
- {DFF9B9D5-5CE0-448E-ADAF-47E26A72017E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {DFF9B9D5-5CE0-448E-ADAF-47E26A72017E}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {DFF9B9D5-5CE0-448E-ADAF-47E26A72017E}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {DFF9B9D5-5CE0-448E-ADAF-47E26A72017E}.Release|Any CPU.Build.0 = Release|Any CPU
- {1A55F098-B1B4-41BC-93F7-EE89A85B0AF6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {1A55F098-B1B4-41BC-93F7-EE89A85B0AF6}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {1A55F098-B1B4-41BC-93F7-EE89A85B0AF6}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {1A55F098-B1B4-41BC-93F7-EE89A85B0AF6}.Release|Any CPU.Build.0 = Release|Any CPU
- {135E07CB-462D-4014-BD74-FF565C60A46D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {135E07CB-462D-4014-BD74-FF565C60A46D}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {135E07CB-462D-4014-BD74-FF565C60A46D}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {135E07CB-462D-4014-BD74-FF565C60A46D}.Release|Any CPU.Build.0 = Release|Any CPU
+ {2176DBB5-D8FD-493C-B896-59E7283E7127}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {2176DBB5-D8FD-493C-B896-59E7283E7127}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {2176DBB5-D8FD-493C-B896-59E7283E7127}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {2176DBB5-D8FD-493C-B896-59E7283E7127}.Release|Any CPU.Build.0 = Release|Any CPU
+ {476312F9-5403-4C3A-848A-0F31213FC72E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {476312F9-5403-4C3A-848A-0F31213FC72E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {476312F9-5403-4C3A-848A-0F31213FC72E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {476312F9-5403-4C3A-848A-0F31213FC72E}.Release|Any CPU.Build.0 = Release|Any CPU
+ {C1AFF814-2C3A-4D04-88A4-5CF10D07AA56}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {C1AFF814-2C3A-4D04-88A4-5CF10D07AA56}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {C1AFF814-2C3A-4D04-88A4-5CF10D07AA56}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {C1AFF814-2C3A-4D04-88A4-5CF10D07AA56}.Release|Any CPU.Build.0 = Release|Any CPU
+ {E01AE039-4B10-4A3B-AB86-EBFC1E2F6B17}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {E01AE039-4B10-4A3B-AB86-EBFC1E2F6B17}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {E01AE039-4B10-4A3B-AB86-EBFC1E2F6B17}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {E01AE039-4B10-4A3B-AB86-EBFC1E2F6B17}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Oops, something went wrong.

0 comments on commit 81dabab

Please sign in to comment.