diff --git a/.gitignore b/.gitignore
index 352fb6e21..5489f4321 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,5 @@ obj/
*.cache
*.trx
Scripts/
+packages/
+TestResults/
diff --git a/docs/History.txt b/History.txt
similarity index 76%
rename from docs/History.txt
rename to History.txt
index cfd331f94..d93d10faa 100644
--- a/docs/History.txt
+++ b/History.txt
@@ -1,7 +1,40 @@
Changelog
===============================================================================
-v0.7.5.0 [in progress]
+v0.7.6
+ - Removed script loading APIs from Script class in mscorlib
+ (moved them to Loader class in Script.Web)
+ - Removed script startup functionality from mscorlib.js ... all script
+ loading is now in ssloader.js (and included into the Runtime nuget
+ package)
+ - Removed Script.Alert/Confirm/Prompt from mscorlib and moved them to
+ Window in Script.Web
+ - Moved SetTimeout, SetInterval and ClearTimeout, ClearInterval from
+ Window object to Script object in mscorlib.
+ - Removed some methods from Type as part of cleanup (AddHandler,
+ GetProperty, RemoveHandler, SetProperty, IsEnum, IsFlags, IsNamespace,
+ GetInterfaces, Parse)
+ - Removed window dependency in mscorlib.js
+ - Debug class now maps directly to console
+ - Moved GetField, HasField, DeleteField, HasMethod, InvokeMethod,
+ CreateInstance, GetScriptType off Type and onto Script while
+ HasProperty, GetProperty, SetProperty, AddHandler, RemoveHandler are gone
+ - Optimize generation of static ctors to use a function scope only when
+ static ctors have a local variable reference.
+ Should help optimize generation of jQuery scripts, by reducing one extra
+ function scope.
+ - Removed Aggregate method from Array, ArrayList and List. Use Reduce instead.
+ Removed the corresponding custom implementation from mscorlib.js.
+ - [git #131] Correctly detect member references within array initializers
+ - [git #161] Add Slice, Splice, Shift, Unshift, Reduce, ReduceRight to
+ Array, ArrayList and List.
+ - [git #228] Restore ability to generate public resource classes
+ (Change Custom Tool property of resx file to
+ ResxPublicScriptGenerator)
+ - [git #230] Add String.IsNullOrWhitespace
+ - [git #234] Knockout API update - added CompareResult status enum
+
+v0.7.5.0
- DOM metadata update (readyState property on Document,
plugins on Navigator)
- jQuery API update (on/off methods)
@@ -26,6 +59,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
diff --git a/License.txt b/License.txt
index ae7144c3e..5f0dac0af 100644
--- a/License.txt
+++ b/License.txt
@@ -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.
diff --git a/Notice.txt b/Notice.txt
new file mode 100644
index 000000000..76e1ddbbc
--- /dev/null
+++ b/Notice.txt
@@ -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
diff --git a/Readme.md b/Readme.md
index b6451d644..3140c065d 100644
--- a/Readme.md
+++ b/Readme.md
@@ -1,37 +1,37 @@
-# Welcome to the Script# Project #
+# Script# Project #
Script# is a development tool that generates JavaScript by compiling C# source code. It is especially interesting for scripting-in-the-large scenarios that is commonplace in the current generation of HTML5 and script-based Web applications.
-Script# lets you leverage the productivity of C# (intellisense, build-time error checking, natural language syntax), and the power Visual Studio IDE and standard .NET tools (such as msbuild, refactoring, unit testing, static analysis, code visualization, fxcop). Script# brings all this to you without abstracting the runtime environment - you're still authoring script, just with a different set of tools.
+The driving principle behind Script# is that JavaScript is the "assembly language of the Web" ... the idea isn't to dislike JavaScript, but rather appreciate it for its flexibility and ubiquity, while bringing the productivity and familiarity of C# when building large scale (large codebase, large team or project over a longer period) application where stronger tools, more maintainable codebases are of utmost importance. You might have heard of this described as "application scale".
-You can even use Script# to work against other existing frameworks and APIs such as jQuery, jQuery plugins and Knockout, and can be extended to work against other existing script.
-
-Script# requires .NET 4.0 and Visual Studio 2010 or (the free) Visual Web Developer Express 2010.
+Specifically, Script# lets you leverage the experience of C# (intellisense, build-time error checking, natural language syntax for OOP constructs), the power Visual Studio IDE and standard .NET tools ecosystem (such as msbuild, refactoring, unit testing, static analysis, code visualization, fxcop). Script# brings all this to you without abstracting the runtime environment - you're still authoring plain-old JavaScript and incorporating the best practices and idioms of JavaScript, just with a different set of tools.
-To learn more about Script#, check out the project site, [http://www.scriptsharp.com](http://www.scriptsharp.com). You can also follow [@scriptsharp](http://twitter.com/scriptsharp) on twitter for the latest announcements. If you'd like, you can also ask general questions about using script# on [stack overflow](http://stackoverflow.com/questions/tagged/script%23).
-
-## Current Status ##
+You can even use Script# to work against other existing frameworks and APIs such as jQuery, jQuery plugins and Knockout, and can be extended to work against other existing script.
-Script# has been an ongoing project for many years, and as such is quite usable. It is in fact used across a number of large (and some *very* large) and successful deployed projects, both within Microsoft and amongst other developers.
+Script# requires .NET 4.0 and Visual Studio 2012. You can also use one of the free Express tools instead such as [Visual Studio 2012 Express for Web](http://www.microsoft.com/visualstudio/eng/downloads#d-express-web) or [Visual Studio 2012 Express for Windows Desktop](http://www.microsoft.com/visualstudio/eng/downloads#d-express-windows-desktop).
-One area where Script# lacks is good and current documentation. While this is addressed (please stay tuned), be sure to check out the [sample apps](https://github.com/nikhilk/scriptsharp/tree/master/samples) in the repository.
+## More Information ##
+The following set of links are relevant if you're using Script# and want to learn more or ask questions, or stay up-to-date.
-There is always room for further improvement that range from bug fixes to full-blown features. If you have feedback or suggestions, be sure to [file an issue](https://github.com/nikhilk/scriptsharp/issues).
+* [Script# Project page](http://scriptsharp.com)
+* [Latest released build](http://bit.ly/ssrelease) (packaged as a Visual Studio extension containing Script# project and item templates)
+* [Issues, suggestions](https://github.com/nikhilk/scriptsharp/issues) here on GitHub. Also, check this out to participate in future design questions, calls for feedback, etc.
+* For general discussion and Q&A, use [StackOverflow](http://stackoverflow.com/questions/tagged/scriptsharp)
+* Follow [@scriptsharp](http://twitter.com/scriptsharp) and [@nikhilk](http://twitter.com/nikhilk) on twitter to keep up with updates and announcements.
-The current release is v0.7.4. The next release, v0.7.5 is slated to be a bug fix release. Thereafter work will begin on a major update that brings about a much improved script generation model that incorporates a number of learnings over the years.
+The [Script# Wiki](https://github.com/nikhilk/scriptsharp/wiki/Wiki) contains the following bits of information if you're checking out the repository, are interested in creating a private build, or even better, looking to contribute to the project.
+* [Repository Contents](https://github.com/nikhilk/scriptsharp/wiki/Repository)
+* [Status](https://github.com/nikhilk/scriptsharp/wiki/Status), including roadmap and some thoughts about areas of contribution
+* [Building and testing](https://github.com/nikhilk/scriptsharp/wiki/Building-and-Testing) the sources, and information on using private as well as incremental pre-release builds
+* [Coding guidelines](https://github.com/nikhilk/scriptsharp/wiki/Coding-Guidelines)
-## Credits ##
+### Credits ###
Script# builds on the excellent Mono.Cecil project. Thanks to Jb Evain.
-## License ##
+Thanks to [all the contributors](https://github.com/nikhilk/scriptsharp/graphs/contributors) who have contributed to Script# over time. Your contributions are welcome, and appreciated. Let me know how you can help - whether its in the form of a feature, a sample, or some evangelizing/spreading the word, or via a suggestion. See the [status page](https://github.com/nikhilk/scriptsharp/wiki/Status) in the wiki for roadmap, plans, and some thoughts about possible contributions.
+
+### License ###
Copyright (c) 2012, Script# Project.
Script# is licensed under the Apache 2.0 License.
-
-## Contributing ##
-
-You are welcome to contribute to script# by reporting bugs/issues, creating and evangelizing samples and success stories, as well as with code.
-Contributors implicity grant all rights to any code updates/additions made to the project for inclusion under the Apache 2 license.
-
-Fork away, and create a pull request! For any major functionality you'd like to add, it might be good to discuss and share thoughts to better coordinate.
diff --git a/bin/cleanup.bat b/bin/cleanup.bat
deleted file mode 100644
index cd4ecbc49..000000000
--- a/bin/cleanup.bat
+++ /dev/null
@@ -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
diff --git a/bin/ref/ScriptSharp.dll b/bin/ref/ScriptSharp.dll
deleted file mode 100644
index dfe6a8d62..000000000
Binary files a/bin/ref/ScriptSharp.dll and /dev/null differ
diff --git a/bin/setup.bat b/bin/setup.bat
deleted file mode 100644
index 079d20021..000000000
--- a/bin/setup.bat
+++ /dev/null
@@ -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
diff --git a/docs/Backlog.txt b/docs/Backlog.txt
deleted file mode 100644
index ef2566b4c..000000000
--- a/docs/Backlog.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-Compiler
-===============================================================================
-- Number truncation when assigning to integer variable
- (assignment, +=, -=, /= etc.)
-
-- Script generation overhaul and optimization
-
-- Look into substr/substring and matching c# semantics
diff --git a/docs/CodingGuidelines.docx b/docs/CodingGuidelines.docx
deleted file mode 100644
index 1f2fdf161..000000000
Binary files a/docs/CodingGuidelines.docx and /dev/null differ
diff --git a/ext/FxCopSdk.dll b/ext/FxCopSdk.dll
deleted file mode 100644
index 39738cefd..000000000
Binary files a/ext/FxCopSdk.dll and /dev/null differ
diff --git a/ext/MSBuildTasks/Info.txt b/ext/MSBuildTasks/Info.txt
deleted file mode 100644
index 09d2054b1..000000000
--- a/ext/MSBuildTasks/Info.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-MSBuild Community Tasks
-
-http://msbuildtasks.tigris.org/
-v1.2.0.306
diff --git a/ext/MSBuildTasks/MSBuild.Community.Tasks.v1.2.0.306.zip b/ext/MSBuildTasks/MSBuild.Community.Tasks.v1.2.0.306.zip
deleted file mode 100644
index 00d6b92f1..000000000
Binary files a/ext/MSBuildTasks/MSBuild.Community.Tasks.v1.2.0.306.zip and /dev/null differ
diff --git a/ext/Microsoft.Cci.dll b/ext/Microsoft.Cci.dll
deleted file mode 100644
index 9cd5df843..000000000
Binary files a/ext/Microsoft.Cci.dll and /dev/null differ
diff --git a/samples/AroundMe/AroundMe.sln b/samples/AroundMe/AroundMe.sln
index 2a8ceda41..c69f9e195 100644
--- a/samples/AroundMe/AroundMe.sln
+++ b/samples/AroundMe/AroundMe.sln
@@ -1,13 +1,18 @@

-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
@@ -15,22 +20,22 @@ Global
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
diff --git a/samples/AroundMe/AroundMe/AroundMe.csproj b/samples/AroundMe/AroundMe/AroundMe.csproj
index 64c0c5352..ef7bf43cb 100644
--- a/samples/AroundMe/AroundMe/AroundMe.csproj
+++ b/samples/AroundMe/AroundMe/AroundMe.csproj
@@ -5,75 +5,114 @@