From 77c02abc9b550b61519c114bc4499f6a6e619095 Mon Sep 17 00:00:00 2001
From: Rob Eisenberg <rob@bluespire.com>
Date: Fri, 16 May 2014 20:27:07 -0400
Subject: [PATCH] Prepping for preview release.

---
 Changes.txt                                                   | 2 +-
 platforms/Bower/Durandal/js/system.js                         | 2 +-
 platforms/HTML/Samples/lib/durandal/js/system.js              | 2 +-
 platforms/HTML/StarterKit/lib/durandal/js/system.js           | 2 +-
 .../Durandal.Transitions/content/Scripts/durandal/system.js   | 2 +-
 .../Nuget/Durandal/content/Scripts/durandal/system.js         | 2 +-
 .../Samples/Durandal.Samples/Scripts/durandal/system.js       | 2 +-
 .../DurandalMvcSpaTemplateVsix/source.extension.vsixmanifest  | 2 +-
 .../DurandalTemplate/Scripts/durandal/system.js               | 2 +-
 .../StarterKit/assets/javascripts/vendor/durandal/system.js   | 2 +-
 src/durandal/js/system.js                                     | 2 +-
 test/specs/viewEngine.spec.js                                 | 4 ++--
 12 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/Changes.txt b/Changes.txt
index e02ba82b3..697531ba8 100644
--- a/Changes.txt
+++ b/Changes.txt
@@ -56,7 +56,7 @@
 -Fix Issue #395: setRoot() composition skips canActivate 
 -Fix Issues #418, #181, #297: Various fixes to activator hierarchies and child routers
 -Fix Issue #461: Router: Click binding not stripping root path 
--Fix Issue #508 Composition on error override 
+-Fix Issue #508: Composition on error override 
 -Fix Issue #511: Always end composition, even on error 
 -Fix Issue #509: Unable to set activator settings "closeOnDeactivate" property to false 
 -Fix Issue #512: Multi-item activator issue 
diff --git a/platforms/Bower/Durandal/js/system.js b/platforms/Bower/Durandal/js/system.js
index abaa0a555..8ec47eb07 100644
--- a/platforms/Bower/Durandal/js/system.js
+++ b/platforms/Bower/Durandal/js/system.js
@@ -114,7 +114,7 @@ define(['require', 'jquery'], function(require, $) {
          * Durandal's version.
          * @property {string} version
          */
-        version: "2.0.1",
+        version: "2.1.0",
         /**
          * A noop function.
          * @method noop
diff --git a/platforms/HTML/Samples/lib/durandal/js/system.js b/platforms/HTML/Samples/lib/durandal/js/system.js
index abaa0a555..8ec47eb07 100644
--- a/platforms/HTML/Samples/lib/durandal/js/system.js
+++ b/platforms/HTML/Samples/lib/durandal/js/system.js
@@ -114,7 +114,7 @@ define(['require', 'jquery'], function(require, $) {
          * Durandal's version.
          * @property {string} version
          */
-        version: "2.0.1",
+        version: "2.1.0",
         /**
          * A noop function.
          * @method noop
diff --git a/platforms/HTML/StarterKit/lib/durandal/js/system.js b/platforms/HTML/StarterKit/lib/durandal/js/system.js
index abaa0a555..8ec47eb07 100644
--- a/platforms/HTML/StarterKit/lib/durandal/js/system.js
+++ b/platforms/HTML/StarterKit/lib/durandal/js/system.js
@@ -114,7 +114,7 @@ define(['require', 'jquery'], function(require, $) {
          * Durandal's version.
          * @property {string} version
          */
-        version: "2.0.1",
+        version: "2.1.0",
         /**
          * A noop function.
          * @method noop
diff --git a/platforms/Microsoft.NET/Nuget/Durandal.Transitions/content/Scripts/durandal/system.js b/platforms/Microsoft.NET/Nuget/Durandal.Transitions/content/Scripts/durandal/system.js
index abaa0a555..8ec47eb07 100644
--- a/platforms/Microsoft.NET/Nuget/Durandal.Transitions/content/Scripts/durandal/system.js
+++ b/platforms/Microsoft.NET/Nuget/Durandal.Transitions/content/Scripts/durandal/system.js
@@ -114,7 +114,7 @@ define(['require', 'jquery'], function(require, $) {
          * Durandal's version.
          * @property {string} version
          */
-        version: "2.0.1",
+        version: "2.1.0",
         /**
          * A noop function.
          * @method noop
diff --git a/platforms/Microsoft.NET/Nuget/Durandal/content/Scripts/durandal/system.js b/platforms/Microsoft.NET/Nuget/Durandal/content/Scripts/durandal/system.js
index abaa0a555..8ec47eb07 100644
--- a/platforms/Microsoft.NET/Nuget/Durandal/content/Scripts/durandal/system.js
+++ b/platforms/Microsoft.NET/Nuget/Durandal/content/Scripts/durandal/system.js
@@ -114,7 +114,7 @@ define(['require', 'jquery'], function(require, $) {
          * Durandal's version.
          * @property {string} version
          */
-        version: "2.0.1",
+        version: "2.1.0",
         /**
          * A noop function.
          * @method noop
diff --git a/platforms/Microsoft.NET/Samples/Durandal.Samples/Scripts/durandal/system.js b/platforms/Microsoft.NET/Samples/Durandal.Samples/Scripts/durandal/system.js
index abaa0a555..8ec47eb07 100644
--- a/platforms/Microsoft.NET/Samples/Durandal.Samples/Scripts/durandal/system.js
+++ b/platforms/Microsoft.NET/Samples/Durandal.Samples/Scripts/durandal/system.js
@@ -114,7 +114,7 @@ define(['require', 'jquery'], function(require, $) {
          * Durandal's version.
          * @property {string} version
          */
-        version: "2.0.1",
+        version: "2.1.0",
         /**
          * A noop function.
          * @method noop
diff --git a/platforms/Microsoft.NET/StarterKit/vsix/DurandalMvcSpaTemplateVsix/source.extension.vsixmanifest b/platforms/Microsoft.NET/StarterKit/vsix/DurandalMvcSpaTemplateVsix/source.extension.vsixmanifest
index e97070948..e9efc4455 100644
--- a/platforms/Microsoft.NET/StarterKit/vsix/DurandalMvcSpaTemplateVsix/source.extension.vsixmanifest
+++ b/platforms/Microsoft.NET/StarterKit/vsix/DurandalMvcSpaTemplateVsix/source.extension.vsixmanifest
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
   <Metadata>
-    <Identity Id="DurandalMvcSpaTemplateVsix..0ef2dc13-b4cd-4d95-ad03-2df4a36764ac" Version="2.0.1" Language="en-US" Publisher="EisenbergEffect" />
+    <Identity Id="DurandalMvcSpaTemplateVsix..0ef2dc13-b4cd-4d95-ad03-2df4a36764ac" Version="2.1.0" Language="en-US" Publisher="EisenbergEffect" />
     <DisplayName>Durandal</DisplayName>
     <Description xml:space="preserve">An ASP.NET MVC 4 project for building a single page application (SPA) with Durandal.</Description>
     <MoreInfo>http://durandaljs.com/</MoreInfo>
diff --git a/platforms/Microsoft.NET/StarterKit/vstemplate/DurandalTemplate/DurandalTemplate/Scripts/durandal/system.js b/platforms/Microsoft.NET/StarterKit/vstemplate/DurandalTemplate/DurandalTemplate/Scripts/durandal/system.js
index abaa0a555..8ec47eb07 100644
--- a/platforms/Microsoft.NET/StarterKit/vstemplate/DurandalTemplate/DurandalTemplate/Scripts/durandal/system.js
+++ b/platforms/Microsoft.NET/StarterKit/vstemplate/DurandalTemplate/DurandalTemplate/Scripts/durandal/system.js
@@ -114,7 +114,7 @@ define(['require', 'jquery'], function(require, $) {
          * Durandal's version.
          * @property {string} version
          */
-        version: "2.0.1",
+        version: "2.1.0",
         /**
          * A noop function.
          * @method noop
diff --git a/platforms/Mimosa/StarterKit/assets/javascripts/vendor/durandal/system.js b/platforms/Mimosa/StarterKit/assets/javascripts/vendor/durandal/system.js
index abaa0a555..8ec47eb07 100644
--- a/platforms/Mimosa/StarterKit/assets/javascripts/vendor/durandal/system.js
+++ b/platforms/Mimosa/StarterKit/assets/javascripts/vendor/durandal/system.js
@@ -114,7 +114,7 @@ define(['require', 'jquery'], function(require, $) {
          * Durandal's version.
          * @property {string} version
          */
-        version: "2.0.1",
+        version: "2.1.0",
         /**
          * A noop function.
          * @method noop
diff --git a/src/durandal/js/system.js b/src/durandal/js/system.js
index b56872726..dc060b9fb 100644
--- a/src/durandal/js/system.js
+++ b/src/durandal/js/system.js
@@ -109,7 +109,7 @@ define(['require', 'jquery'], function(require, $) {
          * Durandal's version.
          * @property {string} version
          */
-        version: "2.0.1",
+        version: "2.1.0",
         /**
          * A noop function.
          * @method noop
diff --git a/test/specs/viewEngine.spec.js b/test/specs/viewEngine.spec.js
index 9a1d32c5e..d443ebfe6 100644
--- a/test/specs/viewEngine.spec.js
+++ b/test/specs/viewEngine.spec.js
@@ -27,7 +27,7 @@
             it('returns require path', function () {
                 var viewId = sut.convertViewIdToRequirePath('test');
 
-                expect(viewId).toBe('text!test.html!strip');
+                expect(viewId).toBe('text!test.html');
             });
         });
 
@@ -127,7 +127,7 @@
                 });
                 var view = sut.createView('test');
 
-                expect(system.acquire).toHaveBeenCalledWith('text!test.html!strip');
+                expect(system.acquire).toHaveBeenCalledWith('text!test.html');
 
                 view.done(function (view) {
                     expect($(view).data('view')).toBe('test');