feature: Content components now targets .NET 4.6.1 instead of 4.7.2

4.6.1 is the default for new Kentico 12 installations and the projects don't use any particular features of 4.7.2 so this should make it easier for consumers to pick up and use these libs from NuGet i.e. not requiring that you change your target framework from the default. Closes #2
CMeeg · Jan 11, 2020 · 436fcbb · 436fcbb
1 parent c5e053f
commit 436fcbb
Show file tree

Hide file tree

Showing 10 changed files with 42 additions and 31 deletions.
diff --git a/.../Meeg.Kentico.ContentComponents.Cms.Admin/Meeg.Kentico.ContentComponents.Cms.Admin.csproj b/.../Meeg.Kentico.ContentComponents.Cms.Admin/Meeg.Kentico.ContentComponents.Cms.Admin.csproj
@@ -13,7 +13,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Meeg.Kentico.ContentComponents.Cms.Admin</RootNamespace>
     <AssemblyName>Meeg.Kentico.ContentComponents.Cms.Admin</AssemblyName>
-    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
     <UseIISExpress>true</UseIISExpress>
     <Use64BitIISExpress />
     <IISExpressSSLPort>44395</IISExpressSSLPort>
@@ -23,6 +23,7 @@
     <UseGlobalApplicationHostFile />
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -72,34 +73,31 @@
     <Reference Include="CMS.Modules">
       <HintPath>..\..\Lib\CMS.Modules.dll</HintPath>
     </Reference>
+    <Reference Include="Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.0\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll</HintPath>
+    </Reference>
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="Microsoft.Web.XmlTransform, Version=2.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>..\..\..\packages\Microsoft.Web.Xdt.2.1.1\lib\net40\Microsoft.Web.XmlTransform.dll</HintPath>
     </Reference>
     <Reference Include="NuGet.Core, Version=2.14.0.832, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\..\..\packages\NuGet.Core.2.14.0\lib\net40-Client\NuGet.Core.dll</HintPath>
     </Reference>
+    <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="System.Web.DynamicData" />
     <Reference Include="System.Web.Entity" />
     <Reference Include="System.Web.ApplicationServices" />
     <Reference Include="System.ComponentModel.DataAnnotations" />
     <Reference Include="System" />
     <Reference Include="System.Data" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="System.Web.Extensions" />
-    <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Drawing" />
     <Reference Include="System.Web" />
     <Reference Include="System.Xml" />
     <Reference Include="System.Configuration" />
     <Reference Include="System.Web.Services" />
     <Reference Include="System.EnterpriseServices" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="Microsoft.CodeDom.Providers.DotNetCompilerPlatform">
-      <HintPath>..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.0\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll</HintPath>
-    </Reference>
+    <Reference Include="System.Xml.Linq" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="CMSFormControls\PageTypeComponent.ascx" />
@@ -165,12 +163,6 @@
       </FlavorProperties>
     </VisualStudio>
   </ProjectExtensions>
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
-    </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.0\build\net46\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.0\build\net46\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props'))" />
-  </Target>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
@@ -179,4 +171,10 @@
   </Target>
   -->
   <Import Project="..\..\..\eng\msbuild\Meeg.Kentico.CmsCopyLocal.targets" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.0\build\net46\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.0\build\net46\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props'))" />
+  </Target>
 </Project>
diff --git a/.../Meeg.Kentico.ContentComponents.Cms.Admin/Meeg.Kentico.ContentComponents.Cms.Admin.nuspec b/.../Meeg.Kentico.ContentComponents.Cms.Admin/Meeg.Kentico.ContentComponents.Cms.Admin.nuspec
@@ -12,7 +12,7 @@
         <tags>kentico</tags>
         <repository type="git" url="https://github.com/CMeeg/kentico-contrib.git" />
         <dependencies>
-            <group targetFramework="net472">
+            <group targetFramework="net461">
                 <dependency id="Meeg.Kentico.ContentComponents.Cms" version="[0.1.0,1.0.0)" />
                 <dependency id="NuGet.Core" version="[2.14.0,3.0.0)" />
             </group>

diff --git a/...ico.ContentComponents/Meeg.Kentico.ContentComponents.Cms.Admin/Properties/AssemblyInfo.cs b/...ico.ContentComponents/Meeg.Kentico.ContentComponents.Cms.Admin/Properties/AssemblyInfo.cs
@@ -14,7 +14,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("meeg")]
 [assembly: AssemblyProduct("Meeg.Kentico.ContentComponents.Cms.Admin")]
-[assembly: AssemblyCopyright("Copyright 2019 Chris Meagher")]
+[assembly: AssemblyCopyright("Copyright 2020 Chris Meagher")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 

diff --git a/src/Meeg.Kentico.ContentComponents/Meeg.Kentico.ContentComponents.Cms.Admin/Web.config b/src/Meeg.Kentico.ContentComponents/Meeg.Kentico.ContentComponents.Cms.Admin/Web.config
@@ -1,23 +1,34 @@
-<?xml version="1.0" encoding="utf-8"?>
-
+<?xml version="1.0"?>
 <!--
   For more information on how to configure your ASP.NET application, please visit
   https://go.microsoft.com/fwlink/?LinkId=169433
   -->
 <configuration>
+    <!--
+    For a description of web.config changes see http://go.microsoft.com/fwlink/?LinkId=235367.
+
+    The following attributes can be set on the <httpRuntime> tag.
+      <system.Web>
+        <httpRuntime targetFramework="4.6.1" />
+      </system.Web>
+  -->
     <system.web>
-        <compilation debug="true" targetFramework="4.7.2" />
-        <httpRuntime targetFramework="4.7.2" />
+        <compilation debug="true" targetFramework="4.6.1"/>
+        <httpRuntime targetFramework="4.6.1"/>
         <pages>
             <controls>
-                <add tagPrefix="cms" namespace="CMS.FormEngine.Web.UI" assembly="CMS.FormEngine.Web.UI" />
+                <add tagPrefix="cms" namespace="CMS.FormEngine.Web.UI" assembly="CMS.FormEngine.Web.UI"/>
             </controls>
         </pages>
     </system.web>
     <system.codedom>
         <compilers>
-            <compiler language="c#;cs;csharp" extension=".cs" type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.CSharpCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" warningLevel="4" compilerOptions="/langversion:default /nowarn:1659;1699;1701" />
-            <compiler language="vb;vbs;visualbasic;vbscript" extension=".vb" type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.VBCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" warningLevel="4" compilerOptions="/langversion:default /nowarn:41008 /define:_MYTYPE=\&quot;Web\&quot; /optionInfer+" />
+            <compiler language="c#;cs;csharp" extension=".cs"
+              type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.CSharpCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"
+              warningLevel="4" compilerOptions="/langversion:default /nowarn:1659;1699;1701"/>
+            <compiler language="vb;vbs;visualbasic;vbscript" extension=".vb"
+              type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.VBCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"
+              warningLevel="4" compilerOptions="/langversion:default /nowarn:41008 /define:_MYTYPE=\&quot;Web\&quot; /optionInfer+"/>
         </compilers>
     </system.codedom>
 </configuration>
diff --git a/src/Meeg.Kentico.ContentComponents/Meeg.Kentico.ContentComponents.Cms.Admin/packages.config b/src/Meeg.Kentico.ContentComponents/Meeg.Kentico.ContentComponents.Cms.Admin/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Microsoft.CodeDom.Providers.DotNetCompilerPlatform" version="2.0.0" targetFramework="net472" />
-  <package id="Microsoft.Web.Xdt" version="2.1.1" targetFramework="net472" />
-  <package id="NuGet.Core" version="2.14.0" targetFramework="net472" />
+  <package id="Microsoft.CodeDom.Providers.DotNetCompilerPlatform" version="2.0.0" targetFramework="net461" />
+  <package id="Microsoft.Web.Xdt" version="2.1.1" targetFramework="net461" />
+  <package id="NuGet.Core" version="2.14.0" targetFramework="net461" />
 </packages>
diff --git a/.../Meeg.Kentico.ContentComponents.Cms.Tests/Meeg.Kentico.ContentComponents.Cms.Tests.csproj b/.../Meeg.Kentico.ContentComponents.Cms.Tests/Meeg.Kentico.ContentComponents.Cms.Tests.csproj
@@ -12,6 +12,7 @@
     <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <Deterministic>true</Deterministic>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>

diff --git a/...ntComponents/Meeg.Kentico.ContentComponents.Cms/Meeg.Kentico.ContentComponents.Cms.csproj b/...ntComponents/Meeg.Kentico.ContentComponents.Cms/Meeg.Kentico.ContentComponents.Cms.csproj
@@ -9,9 +9,10 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Meeg.Kentico.ContentComponents.Cms</RootNamespace>
     <AssemblyName>Meeg.Kentico.ContentComponents.Cms</AssemblyName>
-    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <Deterministic>true</Deterministic>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>

diff --git a/...ntComponents/Meeg.Kentico.ContentComponents.Cms/Meeg.Kentico.ContentComponents.Cms.nuspec b/...ntComponents/Meeg.Kentico.ContentComponents.Cms/Meeg.Kentico.ContentComponents.Cms.nuspec
@@ -11,7 +11,7 @@
         <tags>kentico</tags>
         <repository type="git" url="https://github.com/CMeeg/kentico-contrib.git" />
         <dependencies>
-            <group targetFramework=".NETFramework4.7.2" />
+            <group targetFramework="net461" />
         </dependencies>
     </metadata>
 </package>
diff --git a/...g.Kentico.ContentComponents/Meeg.Kentico.ContentComponents.Cms/Properties/AssemblyInfo.cs b/...g.Kentico.ContentComponents/Meeg.Kentico.ContentComponents.Cms/Properties/AssemblyInfo.cs
@@ -10,7 +10,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("meeg")]
 [assembly: AssemblyProduct("Meeg.Kentico.ContentComponents.Cms")]
-[assembly: AssemblyCopyright("Copyright 2019 Chris Meagher")]
+[assembly: AssemblyCopyright("Copyright 2020 Chris Meagher")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 

diff --git a/...co.ContentComponents/Meeg.Kentico.ContentComponents/Meeg.Kentico.ContentComponents.nuspec b/...co.ContentComponents/Meeg.Kentico.ContentComponents/Meeg.Kentico.ContentComponents.nuspec
@@ -7,7 +7,7 @@
         <authors>meeg</authors>
         <projectUrl>https://github.com/CMeeg/kentico-contrib/tree/master/src/Meeg.Kentico.ContentComponents</projectUrl>
         <license type="expression">MIT</license>
-        <copyright>Copyright 2019 Chris Meagher</copyright>
+        <copyright>Copyright 2020 Chris Meagher</copyright>
         <tags>kentico</tags>
         <repository type="git" url="https://github.com/CMeeg/kentico-contrib.git" />
         <dependencies>