Browse Source

Final updates to work with 2.1RC1

main
Steve Smith 8 years ago
parent
commit
c5a2c86ff0
  1. 2
      src/Web/Web.csproj
  2. 1
      src/WebRazorPages/WebRazorPages.csproj
  3. 3
      tests/FunctionalTests/Web/Controllers/BaseWebTest.cs

2
src/Web/Web.csproj

@ -9,7 +9,7 @@
<PackageReference Include="Microsoft.AspNetCore.App" Version="2.1.0-rc1-final" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="2.1.0-rc1-final" PrivateAssets="All" />
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="2.1.0-rc1-final" PrivateAssets="All" />
</ItemGroup>
<PackageReference Include="Microsoft.VisualStudio.Web.BrowserLink" Version="2.1.0-preview1-final" /> </ItemGroup>
<ItemGroup>
<Folder Include="Views\Catalog\" />
<Folder Include="wwwroot\fonts\" />

1
src/WebRazorPages/WebRazorPages.csproj

@ -6,6 +6,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.App" Version="2.1.0-rc1-final" />
<PackageReference Include="Microsoft.VisualStudio.Web.BrowserLink" Version="2.1.0-preview1-final" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\ApplicationCore\ApplicationCore.csproj" />

3
tests/FunctionalTests/Web/Controllers/BaseWebTest.cs

@ -2,7 +2,6 @@
using System.IO;
using System.Net.Http;
using System.Reflection;
using Microsoft.Extensions.PlatformAbstractions;
using Microsoft.eShopWeb;
using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.TestHost;
@ -66,7 +65,7 @@ namespace FunctionalTests.Web.Controllers
var projectName = startupAssembly.GetName().Name;
// Get currently executing test project path
var applicationBasePath = PlatformServices.Default.Application.ApplicationBasePath;
var applicationBasePath = AppContext.BaseDirectory;
// Find the folder which contains the solution file. We then use this information to find the target
// project which we want to test.

Loading…
Cancel
Save