Skip to content

Commit

Permalink
Update projects to target netcoreapp2.0
Browse files Browse the repository at this point in the history
  • Loading branch information
SteveSanderson committed Nov 6, 2017
1 parent 80b937b commit d5e265b
Show file tree
Hide file tree
Showing 7 changed files with 7 additions and 7 deletions.
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup>
<TargetFramework>netcoreapp1.0</TargetFramework>
<TargetFramework>netcoreapp2.0</TargetFramework>
<OutputType>exe</OutputType>
</PropertyGroup>
<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/Blazor.Compiler/Blazor.Compiler.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

<PropertyGroup>
<OutputType>exe</OutputType>
<TargetFramework>netcoreapp1.0</TargetFramework>
<TargetFramework>netcoreapp2.0</TargetFramework>
<PreserveCompilationContext>true</PreserveCompilationContext>
<PackageOutputPath>$(MSBuildThisFileDirectory)../../artifacts/</PackageOutputPath>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/Blazor.Compiler/Properties/launchSettings.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"profiles": {
"RazorRenderer": {
"commandName": "Project",
"commandLineArgs": "..\\..\\samples\\ClientServerApp\\ClientServerApp.Client\\ ClientServerApp.Client ..\\..\\samples\\ClientServerApp\\ClientServerApp.Client\\bin\\Debug\\netcoreapp1.0\\ClientServerApp.Client.dll"
"commandLineArgs": "..\\..\\samples\\ClientServerApp\\ClientServerApp.Client\\ ClientServerApp.Client ..\\..\\samples\\ClientServerApp\\ClientServerApp.Client\\bin\\Debug\\netcoreapp2.0\\ClientServerApp.Client.dll"
}
}
}
2 changes: 1 addition & 1 deletion src/Blazor.Compiler/build/Blazor.Compiler.props
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<_RazorCompilationBinaryPath>$(MSBuildThisFileDirectory)..\lib\netcoreapp1.0\$(MSBuildThisFileName).dll</_RazorCompilationBinaryPath>
<_RazorCompilationBinaryPath>$(MSBuildThisFileDirectory)..\lib\netcoreapp2.0\$(MSBuildThisFileName).dll</_RazorCompilationBinaryPath>
</PropertyGroup>

<!-- TODO: Run this automatically in production builds -->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ public static IApplicationBuilder UseBlazorUI(this IApplicationBuilder app, stri
});

// For requests under /_bin, serve assemblies from the client app's bin dir
var clientBinDir = Path.GetFullPath(Path.Combine(rootPath, "bin", "Debug", "netcoreapp1.0"));
var clientBinDir = Path.GetFullPath(Path.Combine(rootPath, "bin", "Debug", "netcoreapp2.0"));

app.UseStaticFiles(new StaticFileOptions
{
Expand Down
2 changes: 1 addition & 1 deletion src/Blazor.Host/Server/RazorCompilation.cs
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ private static (byte[], byte[]) PerformCompilation(string assemblyFilename, stri
rootDir: rootDir,
referenceAssemblies: referenceAssemblyFilenames.Select(filename =>
{
var path = Path.Combine(rootDir, "bin", "Debug", "netcoreapp1.0", filename);
var path = Path.Combine(rootDir, "bin", "Debug", "netcoreapp2.0", filename);

if (!File.Exists(path))
{
Expand Down
2 changes: 1 addition & 1 deletion template/MyApplication/MyApplication.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFramework>netcoreapp1.0</TargetFramework>
<TargetFramework>netcoreapp2.0</TargetFramework>
<OutputType>exe</OutputType>
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
</PropertyGroup>
Expand Down

0 comments on commit d5e265b

Please sign in to comment.