Some csproj updates. (#1973)

OrchardCMS · Jun 15, 2018 · 206101a · 206101a
1 parent 4c31e6b
commit 206101a
Show file tree

Hide file tree

Showing 9 changed files with 8 additions and 11 deletions.
diff --git a/src/OrchardCore.Build/Dependencies.props b/src/OrchardCore.Build/Dependencies.props
@@ -1,6 +1,6 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
-  <Import Project="..\..\src\OrchardCore.Build\Dependencies.AspNetCore.props" />
+  <Import Project="Dependencies.AspNetCore.props" />
 
   <PropertyGroup>
     <!-- Special case - this property is used by a DotNetCliToolReference -->

diff --git a/...rchardCore/OrchardCore.Application.Cms.Targets/OrchardCore.Application.Cms.Targets.csproj b/...rchardCore/OrchardCore.Application.Cms.Targets/OrchardCore.Application.Cms.Targets.csproj
@@ -2,7 +2,6 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <IgnorePackageAssets>true</IgnorePackageAssets>
   </PropertyGroup>
 
   <!-- Add a ".targets" file in the package specific to the "Cms" bundle -->

diff --git a/...rchardCore/OrchardCore.Application.Mvc.Targets/OrchardCore.Application.Mvc.Targets.csproj b/...rchardCore/OrchardCore.Application.Mvc.Targets/OrchardCore.Application.Mvc.Targets.csproj
@@ -1,8 +1,7 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <IgnorePackageAssets>true</IgnorePackageAssets>
     <IncludeBuildOutput>false</IncludeBuildOutput>
   </PropertyGroup>
 

diff --git a/...rdCore/OrchardCore.Application.Nancy.Targets/OrchardCore.Application.Nancy.Targets.csproj b/...rdCore/OrchardCore.Application.Nancy.Targets/OrchardCore.Application.Nancy.Targets.csproj
@@ -1,8 +1,7 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <IgnorePackageAssets>true</IgnorePackageAssets>
     <IncludeBuildOutput>false</IncludeBuildOutput>
   </PropertyGroup>
 

diff --git a/test/OrchardCore.Tests.Modules/BaseThemeSample/BaseThemeSample.csproj b/test/OrchardCore.Tests.Modules/BaseThemeSample/BaseThemeSample.csproj
@@ -5,7 +5,7 @@
   <Import Project="..\..\..\src\OrchardCore\OrchardCore.Module.Targets\OrchardCore.Module.Targets.props" />
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>netstandard2.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/test/OrchardCore.Tests.Modules/BaseThemeSample2/BaseThemeSample2.csproj b/test/OrchardCore.Tests.Modules/BaseThemeSample2/BaseThemeSample2.csproj
@@ -5,7 +5,7 @@
   <Import Project="..\..\..\src\OrchardCore\OrchardCore.Module.Targets\OrchardCore.Module.Targets.props" />
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>netstandard2.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/test/OrchardCore.Tests.Modules/DerivedThemeSample/DerivedThemeSample.csproj b/test/OrchardCore.Tests.Modules/DerivedThemeSample/DerivedThemeSample.csproj
@@ -5,7 +5,7 @@
   <Import Project="..\..\..\src\OrchardCore\OrchardCore.Module.Targets\OrchardCore.Module.Targets.props" />
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>netstandard2.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/test/OrchardCore.Tests.Modules/DerivedThemeSample2/DerivedThemeSample2.csproj b/test/OrchardCore.Tests.Modules/DerivedThemeSample2/DerivedThemeSample2.csproj
@@ -5,7 +5,7 @@
   <Import Project="..\..\..\src\OrchardCore\OrchardCore.Module.Targets\OrchardCore.Module.Targets.props" />
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>netstandard2.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/test/OrchardCore.Tests.Modules/ModuleSample/ModuleSample.csproj b/test/OrchardCore.Tests.Modules/ModuleSample/ModuleSample.csproj
@@ -4,7 +4,7 @@
   <Import Project="..\..\..\src\OrchardCore\OrchardCore.Module.Targets\OrchardCore.Module.Targets.props" />
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>netstandard2.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>