Skip to content

Commit

Permalink
Revert "First spike for ASP.NET MVC5"
Browse files Browse the repository at this point in the history 
This reverts commit 5f8d406.
  • Loading branch information
@maartenba
maartenba committed Oct 9, 2013
1 parent 5f8d406 commit acc1dac
Show file tree
Hide file tree
Showing 9 changed files with 30 additions and 83 deletions.
19 changes: 1 addition & 18 deletions build/runbuild.ps1
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ task Compile -depends Clean, Init -description "This task compiles the solution"
Build-MvcSiteMapProvider-Core-Versions ("net35", "net40", "net45") -mvc_version "2"
Build-MvcSiteMapProvider-Core-Versions ("net40", "net45") -mvc_version "3"
Build-MvcSiteMapProvider-Core-Versions ("net40", "net45") -mvc_version "4"
Build-MvcSiteMapProvider-Core-Versions ("net45") -mvc_version "5"
}

task NuGet -depends Compile -description "This tasks makes creates the NuGet packages" {
Expand All @@ -52,20 +51,10 @@ task NuGet -depends Compile -description "This tasks makes creates the NuGet pac
Create-MvcSiteMapProvider-Package -mvc_version "2"
Create-MvcSiteMapProvider-Package -mvc_version "3"
Create-MvcSiteMapProvider-Package -mvc_version "4"

$oldPackageVersion = $packageVersion
$packageVersion = "$packageVersion-alpha" + $packageVersion.Replace(".", "")
Create-MvcSiteMapProvider-Package -mvc_version "5"
$packageVersion = $oldPackageVersion


Create-MvcSiteMapProvider-Core-Package -mvc_version "2"
Create-MvcSiteMapProvider-Core-Package -mvc_version "3"
Create-MvcSiteMapProvider-Core-Package -mvc_version "4"

$oldPackageVersion = $packageVersion
$packageVersion = "$packageVersion-alpha" + $packageVersion.Replace(".", "")
Create-MvcSiteMapProvider-Core-Package -mvc_version "5"
$packageVersion = $oldPackageVersion

Create-MvcSiteMapProvider-Web-Package

Expand Down Expand Up @@ -270,12 +259,6 @@ function Create-DIContainer-Packages ([string[]] $di_containers) {

Create-DIContainer-Package $di_container ("net40", "net45") -mvc_version "4"
Create-DIContainer-Modules-Package $di_container ("net40", "net45") -mvc_version "4"

$oldPackageVersion = $packageVersion
$packageVersion = "$packageVersion-alpha" + $packageVersion.Replace(".", "")
Create-DIContainer-Package $di_container ("net45") -mvc_version "5"
Create-DIContainer-Modules-Package $di_container ("net45") -mvc_version "5"
$packageVersion = $oldPackageVersion
}
}

Expand Down
13 changes: 0 additions & 13 deletions nuget/mvcsitemapprovider.core/MvcSiteMapProvider.MVC5.Core.nutrans
View file

This file was deleted.

2 changes: 1 addition & 1 deletion src/MvcSiteMapProvider/MvcMusicStore/Code/NonAuthenticatedVisibilityProvider.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ public class NonAuthenticatedVisibilityProvider
: SiteMapNodeVisibilityProviderBase
{
#region ISiteMapNodeVisibilityProvider Members

/// <summary>
/// Determines whether the node is visible.
/// </summary>
Expand Down
1 change: 0 additions & 1 deletion src/MvcSiteMapProvider/MvcMusicStore/Code/UpperCaseSiteMapNodeUrlResolver.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ public class UpperCaseSiteMapNodeUrlResolver
public UpperCaseSiteMapNodeUrlResolver(IMvcContextFactory mvcContextFactory, IUrlPath urlPath)
: base(mvcContextFactory, urlPath)
{

}

/// <summary>
Expand Down
38 changes: 19 additions & 19 deletions src/MvcSiteMapProvider/MvcSiteMapProvider.Tests/MvcSiteMapProvider.Tests.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,38 +47,38 @@
<HintPath>..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
</Reference>
<Reference Include="Moq">
<HintPath>..\packages\Moq.4.1.1309.1617\lib\net40\Moq.dll</HintPath>
<HintPath>..\packages\Moq.4.0.10827\lib\NET40\Moq.dll</HintPath>
</Reference>
<Reference Include="nunit.framework, Version=2.6.2.12296, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\NUnit.2.6.2\lib\nunit.framework.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Web" />
<Reference Include="System.Web.Helpers, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.0.0-rc1\lib\net45\System.Web.Helpers.dll</HintPath>
<Reference Include="System.Web.Helpers, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<Private>True</Private>
<HintPath>..\packages\Microsoft.AspNet.WebPages.2.0.30506.0\lib\net40\System.Web.Helpers.dll</HintPath>
</Reference>
<Reference Include="System.Web.Mvc, Version=5.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Microsoft.AspNet.Mvc.5.0.0-rc1\lib\net45\System.Web.Mvc.dll</HintPath>
<Reference Include="System.Web.Mvc, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<Private>True</Private>
<HintPath>..\packages\Microsoft.AspNet.Mvc.4.0.30506.0\lib\net40\System.Web.Mvc.dll</HintPath>
</Reference>
<Reference Include="System.Web.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Microsoft.AspNet.Razor.3.0.0-rc1\lib\net45\System.Web.Razor.dll</HintPath>
<Reference Include="System.Web.Razor, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<Private>True</Private>
<HintPath>..\packages\Microsoft.AspNet.Razor.2.0.30506.0\lib\net40\System.Web.Razor.dll</HintPath>
</Reference>
<Reference Include="System.Web.Routing" />
<Reference Include="System.Web.WebPages, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.0.0-rc1\lib\net45\System.Web.WebPages.dll</HintPath>
<Reference Include="System.Web.WebPages, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<Private>True</Private>
<HintPath>..\packages\Microsoft.AspNet.WebPages.2.0.30506.0\lib\net40\System.Web.WebPages.dll</HintPath>
</Reference>
<Reference Include="System.Web.WebPages.Deployment, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.0.0-rc1\lib\net45\System.Web.WebPages.Deployment.dll</HintPath>
<Reference Include="System.Web.WebPages.Deployment, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<Private>True</Private>
<HintPath>..\packages\Microsoft.AspNet.WebPages.2.0.30506.0\lib\net40\System.Web.WebPages.Deployment.dll</HintPath>
</Reference>
<Reference Include="System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.0.0-rc1\lib\net45\System.Web.WebPages.Razor.dll</HintPath>
<Reference Include="System.Web.WebPages.Razor, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<Private>True</Private>
<HintPath>..\packages\Microsoft.AspNet.WebPages.2.0.30506.0\lib\net40\System.Web.WebPages.Razor.dll</HintPath>
</Reference>
</ItemGroup>
<Choose>
Expand Down
8 changes: 4 additions & 4 deletions src/MvcSiteMapProvider/MvcSiteMapProvider.Tests/packages.config
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Microsoft.AspNet.Mvc" version="5.0.0-rc1" targetFramework="net45" />
<package id="Microsoft.AspNet.Razor" version="3.0.0-rc1" targetFramework="net45" />
<package id="Microsoft.AspNet.WebPages" version="3.0.0-rc1" targetFramework="net45" />
<package id="Microsoft.AspNet.Mvc" version="4.0.30506.0" targetFramework="net45" />
<package id="Microsoft.AspNet.Razor" version="2.0.30506.0" targetFramework="net45" />
<package id="Microsoft.AspNet.WebPages" version="2.0.30506.0" targetFramework="net45" />
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net45" />
<package id="Moq" version="4.1.1309.1617" targetFramework="net45" />
<package id="Moq" version="4.0.10827" targetFramework="net45" />
<package id="NUnit" version="2.6.2" targetFramework="net45" />
</packages>
1 change: 0 additions & 1 deletion src/MvcSiteMapProvider/MvcSiteMapProvider/Builder/AspNetDefaultSiteMapProvider.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,3 @@ public SiteMapProvider GetProvider()
#endregion
}
}

24 changes: 3 additions & 21 deletions src/MvcSiteMapProvider/MvcSiteMapProvider/MvcSiteMapProvider.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>MvcSiteMapProvider</RootNamespace>
<AssemblyName>MvcSiteMapProvider</AssemblyName>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<TargetFrameworkProfile />
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
Expand All @@ -21,11 +21,11 @@
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants Condition=" '$(DefineConstants)' == '' ">MVC5;NET45</DefineConstants>
<DefineConstants Condition=" '$(DefineConstants)' == '' ">MVC4;NET40</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<Prefer32Bit>false</Prefer32Bit>
<DefineConstants>MVC5;NET45</DefineConstants>
<DefineConstants>MVC4;NET40</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
Expand Down Expand Up @@ -71,24 +71,6 @@
<HintPath>..\packages\Microsoft.AspNet.WebPages.2.0.20710.0\lib\net40\System.Web.WebPages.Razor.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup Condition=" $(DefineConstants.Contains('MVC5')) ">
<Reference Include="System.Web.Mvc, Version=5.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<Private>True</Private>
<HintPath>..\packages\Microsoft.AspNet.Mvc.5.0.0-rc1\lib\net45\System.Web.Mvc.dll</HintPath>
</Reference>
<Reference Include="System.Web.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<Private>True</Private>
<HintPath>..\packages\Microsoft.AspNet.Razor.3.0.0-rc1\lib\net45\System.Web.Razor.dll</HintPath>
</Reference>
<Reference Include="System.Web.WebPages, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<Private>True</Private>
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.0.0-rc1\lib\net45\System.Web.WebPages.dll</HintPath>
</Reference>
<Reference Include="System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<Private>True</Private>
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.0.0-rc1\lib\net45\System.Web.WebPages.Razor.dll</HintPath>
</Reference>
</ItemGroup>
<!-- .NET 4.0 or greater -->
<ItemGroup Condition=" !$(DefineConstants.Contains('NET35')) ">
<Reference Include="Microsoft.Web.Infrastructure, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
Expand Down
7 changes: 2 additions & 5 deletions src/MvcSiteMapProvider/MvcSiteMapProvider/packages.config
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Microsoft.AspNet.Mvc" version="4.0.20710.0" targetFramework="net40" />
<package id="Microsoft.AspNet.Mvc" version="5.0.0-rc1" targetFramework="net45" />
<package id="Microsoft.AspNet.Razor" version="1.0.20105.408" targetFramework="net35" />
<package id="Microsoft.AspNet.Razor" version="2.0.20715.0" targetFramework="net40" />
<package id="Microsoft.AspNet.Razor" version="3.0.0-rc1" targetFramework="net45" />
<package id="Microsoft.AspNet.Razor" version="2.0.20715.0" targetFramework="net40" />
<package id="Microsoft.AspNet.WebPages" version="1.0.20105.408" targetFramework="net35" />
<package id="Microsoft.AspNet.WebPages" version="2.0.20710.0" targetFramework="net40" />
<package id="Microsoft.AspNet.WebPages" version="3.0.0-rc1" targetFramework="net45" />
<package id="Microsoft.AspNet.WebPages" version="2.0.20710.0" targetFramework="net40" />
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net40" />
<package id="WebActivatorEx" version="2.0.1" targetFramework="net40" />
</packages>

0 comments on commit acc1dac

Please sign in to comment.