Prepping for preview release.

BlueSpire · May 17, 2014 · 77c02ab · 77c02ab
1 parent 7ef1df1
commit 77c02ab
Show file tree

Hide file tree

Showing 12 changed files with 13 additions and 13 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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/...ms/Microsoft.NET/StarterKit/vsix/DurandalMvcSpaTemplateVsix/source.extension.vsixmanifest b/...ms/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/...ft.NET/StarterKit/vstemplate/DurandalTemplate/DurandalTemplate/Scripts/durandal/system.js b/...ft.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
@@ -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
@@ -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
@@ -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');