(cake-contrib#24, cake-contrib#25, cake-contrib#26) update Cake refer…

…ence to Cake 1.0.0 Also switch to using dotnet sdk projects and add a reference to CakeContrib.Guidelines
nils-a · Aug 16, 2022 · 88395e3 · 88395e3
1 parent 90aaa82
commit 88395e3
Show file tree

Hide file tree

Showing 12 changed files with 68 additions and 262 deletions.
diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2015 Fredrik Leijon
+Copyright (c) 2015 Fredrik Leijon, 2016 - Present Cake Contributions
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/nuspec/nuget/Cake.FluentMigrator.nuspec b/nuspec/nuget/Cake.FluentMigrator.nuspec
diff --git a/recipe.cake b/recipe.cake
@@ -9,15 +9,18 @@ BuildParameters.SetParameters(context: Context,
                             repositoryOwner: "cake-contrib",
                             repositoryName: "Cake.FluentMigrator",
                             appVeyorAccountName: "cakecontrib",
-                            shouldCalculateVersion: true);
+                            shouldCalculateVersion: true,
+                            shouldRunDotNetCorePack: true,
+                            shouldRunDupFinder: false,
+                            shouldRunInspectCode: false);
 
 BuildParameters.PrintParameters(Context);
 
 ToolSettings.SetToolSettings(context: Context,
                             dupFinderExcludePattern: new string[] {
                                 BuildParameters.RootDirectoryPath + "/src/Cake.FluentMigrator.Tests/*.cs" },
-                            testCoverageFilter: "+[*]* -[xunit.*]* -[Cake.Core]* -[Cake.Testing]* -[*.Tests]* ",
+                            testCoverageFilter: "+[*]* -[xunit.*]* -[Cake.Core]* -[Cake.Testing]* -[*.Tests]*",
                             testCoverageExcludeByAttribute: "*.ExcludeFromCodeCoverage*",
                             testCoverageExcludeByFile: "*/*Designer.cs;*/*.g.cs;*/*.g.i.cs");
 
-Build.Run();
+Build.RunDotNetCore();
diff --git a/src/Cake.FluentMigrator.Tests/Cake.FluentMigrator.Tests.csproj b/src/Cake.FluentMigrator.Tests/Cake.FluentMigrator.Tests.csproj
@@ -1,101 +1,21 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project Sdk="Microsoft.NET.Sdk">
+
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{08F1BC1D-4A27-418C-9044-51055A06B5FC}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Cake.FluentMigrator.Tests</RootNamespace>
-    <AssemblyName>Cake.FluentMigrator.Tests</AssemblyName>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
-    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages</ReferencePath>
-    <IsCodedUITest>False</IsCodedUITest>
-    <TestProjectType>UnitTest</TestProjectType>
-    <NuGetPackageImportStamp>
-    </NuGetPackageImportStamp>
-    <TargetFrameworkProfile />
+    <TargetFrameworks>net461;net5.0;net6.0</TargetFrameworks>
+    <Description>Cake FluentMigrator Addin Tests</Description>
+    <IsPackable>false</IsPackable>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Cake.Core, Version=0.33.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Cake.Core.0.33.0\lib\net46\Cake.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="NSubstitute, Version=1.10.0.0, Culture=neutral, PublicKeyToken=92dd2e9066daa5ca, processorArchitecture=MSIL">
-      <HintPath>..\packages\NSubstitute.1.10.0.0\lib\net45\NSubstitute.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-    <Reference Include="System.Xml.Linq" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="..\SolutionInfo.cs">
-      <Link>Properties\SolutionInfo.cs</Link>
-    </Compile>
-    <Compile Include="FluentMigratorToolResolverTests.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="ToolResolverFixture.cs" />
-  </ItemGroup>
+
   <ItemGroup>
-    <None Include="packages.config" />
+    <PackageReference Include="Cake.Testing" Version="1.3.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
+    <PackageReference Include="MSTest.TestAdapter" Version="2.2.10" />
+    <PackageReference Include="MSTest.TestFramework" Version="2.2.10" />
+    <PackageReference Include="NSubstitute" Version="4.4.0" />
   </ItemGroup>
+
   <ItemGroup>
-    <ProjectReference Include="..\Cake.FluentMigrator\Cake.FluentMigrator.csproj">
-      <Project>{2803512b-59c0-4a53-91e5-4d1c40949a63}</Project>
-      <Name>Cake.FluentMigrator</Name>
-    </ProjectReference>
+    <ProjectReference Include="..\Cake.FluentMigrator\Cake.FluentMigrator.csproj" />
   </ItemGroup>
-  <Choose>
-    <When Condition="'$(VisualStudioVersion)' == '10.0' And '$(IsCodedUITest)' == 'True'">
-      <ItemGroup>
-        <Reference Include="Microsoft.VisualStudio.QualityTools.CodedUITestFramework, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-          <Private>False</Private>
-        </Reference>
-        <Reference Include="Microsoft.VisualStudio.TestTools.UITest.Common, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-          <Private>False</Private>
-        </Reference>
-        <Reference Include="Microsoft.VisualStudio.TestTools.UITest.Extension, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-          <Private>False</Private>
-        </Reference>
-        <Reference Include="Microsoft.VisualStudio.TestTools.UITesting, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-          <Private>False</Private>
-        </Reference>
-      </ItemGroup>
-    </When>
-  </Choose>
-  <Import Project="$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets" Condition="Exists('$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets')" />
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- 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">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
+
+</Project>
diff --git a/src/Cake.FluentMigrator.Tests/Properties/AssemblyInfo.cs b/src/Cake.FluentMigrator.Tests/Properties/AssemblyInfo.cs
diff --git a/src/Cake.FluentMigrator.Tests/packages.config b/src/Cake.FluentMigrator.Tests/packages.config
diff --git a/src/Cake.FluentMigrator.sln b/src/Cake.FluentMigrator.sln
@@ -7,6 +7,11 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cake.FluentMigrator", "Cake
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cake.FluentMigrator.Tests", "Cake.FluentMigrator.Tests\Cake.FluentMigrator.Tests.csproj", "{08F1BC1D-4A27-418C-9044-51055A06B5FC}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Global", "Global", "{54F24770-D3A8-438B-8ED2-73F8B0608E46}"
+	ProjectSection(SolutionItems) = preProject
+		Directory.Build.props = Directory.Build.props
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU

diff --git a/src/Cake.FluentMigrator/Cake.FluentMigrator.csproj b/src/Cake.FluentMigrator/Cake.FluentMigrator.csproj
@@ -1,76 +1,36 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+<Project Sdk="Microsoft.NET.Sdk">
+
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{2803512B-59C0-4A53-91E5-4D1C40949A63}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Cake.FluentMigrator</RootNamespace>
-    <AssemblyName>Cake.FluentMigrator</AssemblyName>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>
-    </NuGetPackageImportStamp>
-    <TargetFrameworkProfile />
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <DocumentationFile>bin\Debug\Cake.FluentMigrator.XML</DocumentationFile>
+    <TargetFrameworks>net461;net5.0;netstandard2.0</TargetFrameworks>
     <CodeAnalysisRuleSet>Cake.FluentMigrator.ruleset</CodeAnalysisRuleSet>
+    <IsPackable>true</IsPackable>
+    <CreateXmlDoc>true</CreateXmlDoc>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <DocumentationFile>bin\Release\Cake.FluentMigrator.XML</DocumentationFile>
-    <CodeAnalysisRuleSet>Cake.FluentMigrator.ruleset</CodeAnalysisRuleSet>
+
+  <PropertyGroup>
+    <Authors>Fredrik Leijon, cake-contrib</Authors>
+    <Description>FluentMigrator extension for Cake.</Description>
+    <PackageLicenseExpression>MIT</PackageLicenseExpression>
+    <PackageProjectUrl>https://cake-contrib.github.io/Cake.FluentMigrator</PackageProjectUrl>
+    <PackageTags>cake;build;cake-build;script;addin;cake-addin;FluentMigrator</PackageTags>
+    <RepositoryUrl>https://github.com/cake-contrib/Cake.FluentMigrator.git</RepositoryUrl>
+    <PackageReleaseNotes>https://github.com/cake-contrib/Cake.FluentMigrator/releases</PackageReleaseNotes>
   </PropertyGroup>
+
   <ItemGroup>
-    <Reference Include="Cake.Core, Version=0.33.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Cake.Core.0.33.0\lib\net46\Cake.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="..\SolutionInfo.cs">
-      <Link>Properties\SolutionInfo.cs</Link>
-    </Compile>
-    <Compile Include="FluentMigratorAliases.cs" />
-    <Compile Include="FluentMigratorRunner.cs" />
-    <Compile Include="FluentMigratorSettings.cs" />
-    <Compile Include="FluentMigratorToolResolver.cs" />
-    <Compile Include="IFluentMigratorToolResolver.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
+    <!-- opt out of GCC0009 for the moment -->
+    <CakeContribGuidelinesOmitRecommendedCakeVersion Include="Cake.Core" />
+    <!-- opt out of stylecop for the moment -->
+    <CakeContribGuidelinesOmitRecommendedReference Include="StyleCop.Analyzers" />
+    <CakeContribGuidelinesOmitRecommendedConfigFile Include="stylecop.json" />
   </ItemGroup>
+
   <ItemGroup>
-    <None Include="Cake.FluentMigrator.ruleset" />
-    <None Include="packages.config" />
+    <PackageReference Include="Cake.Core" Version="1.0.0" PrivateAssets="All"/>
+    <PackageReference Include="CakeContrib.Guidelines" Version="1.3.0">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- 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">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
+
+</Project>
diff --git a/src/Cake.FluentMigrator/Properties/AssemblyInfo.cs b/src/Cake.FluentMigrator/Properties/AssemblyInfo.cs
diff --git a/src/Cake.FluentMigrator/packages.config b/src/Cake.FluentMigrator/packages.config
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -0,0 +1,13 @@
+<Project>
+
+    <PropertyGroup>
+        <ImplicitUsings>disable</ImplicitUsings>
+        <Nullable>disable</Nullable>
+        <LangVersion>8</LangVersion>
+        <Company>Cake Contributions</Company>
+        <Product>Cake.FluentMigrator</Product>
+        <Copyright>Copyright © Fredrik Leijon 2015, Cake Contributions 2016 - Present</Copyright>
+    </PropertyGroup>
+
+</Project>
+
diff --git a/src/SolutionInfo.cs b/src/SolutionInfo.cs