Reduce DevExpress references

awaescher · Mar 16, 2020 · bb6ecec · bb6ecec
1 parent 3f4c8b9
commit bb6ecec
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 10 deletions.
diff --git a/Fusion++.Tests/Properties/AssemblyInfo.cs b/Fusion++.Tests/Properties/AssemblyInfo.cs
@@ -15,8 +15,8 @@
 
 [assembly: Guid("967e8901-43de-4af1-86df-bb18c8949c44")]
 
-// [assembly: AssemblyVersion("1.1.1.0")]
-[assembly: AssemblyVersion("1.1.1.0")]
-[assembly: AssemblyFileVersion("1.1.1.0")]
+// [assembly: AssemblyVersion("1.2.0.0")]
+[assembly: AssemblyVersion("1.2.0.0")]
+[assembly: AssemblyFileVersion("1.2.0.0")]
 
-[assembly: AssemblyInformationalVersion("1.1.1-netcore.1+17.Branch.feature/netcore.Sha.09126cceaac7471eac58c87cdd14143fe198120f")]
+[assembly: AssemblyInformationalVersion("1.2.0+Branch.master.Sha.3f4c8b95ce6955674493af180e6242e95fe6b84d")]
diff --git a/Fusion++/Fusion++.csproj b/Fusion++/Fusion++.csproj
@@ -1,18 +1,20 @@
-<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
+<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
     <TargetFramework>netcoreapp3.1</TargetFramework>
     <RootNamespace>FusionPlusPlus</RootNamespace>
     <UseWindowsForms>true</UseWindowsForms>
     <ApplicationManifest>app.manifest</ApplicationManifest>
-    <AssemblyVersion>1.1.0.0</AssemblyVersion>
-    <Version>1.1.0</Version>
-    <FileVersion>1.1.0.0</FileVersion>
+    <AssemblyVersion>1.2</AssemblyVersion>
+    <Version>1.2.0.0</Version>
+    <FileVersion>1.2.0.0</FileVersion>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="DevExpress.WindowsDesktop.Win" Version="19.2.6-ctp" />
+    <PackageReference Include="DevExpress.WindowsDesktop.Win.Bars" Version="19.2.6-ctp" />
+    <PackageReference Include="DevExpress.WindowsDesktop.Win.Grid" Version="19.2.6-ctp" />
+    <PackageReference Include="DevExpress.WindowsDesktop.Win.RichEdit" Version="19.2.6-ctp" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/build.cake b/build.cake
@@ -60,6 +60,10 @@ Task("SetVersion")
 		_appVersion = $"{gitVersion.Major}.{gitVersion.Minor}" + (gitVersion.Patch == 0 ? "" : $".{gitVersion.Patch}");
 		var fullVersion = gitVersion.AssemblySemVer;
 		
+		ReplaceRegexInFiles("./**/*.csproj", "(?<=<AssemblyVersion>).*?(?=</AssemblyVersion>)", _appVersion);
+		ReplaceRegexInFiles("./**/*.csproj", "(?<=<Version>).*?(?=</Version>)", fullVersion);
+		ReplaceRegexInFiles("./**/*.csproj", "(?<=<FileVersion>).*?(?=</FileVersion>)", fullVersion);
+
 		Information($"AppVersion:\t{_appVersion}");
 		Information($"FullVersion:\t{fullVersion}");
 	});
@@ -138,7 +142,7 @@ Task("Publish")
 
 	// files are published to Fusion++\bin\Release\netcoreapp3.1\win-x64\publish
 	CopyFiles($"./Fusion++/bin/{configuration}/{netcoreTargetFramework}/{settings.Runtime}/publish/**/*", _outputDir, true);
-	
+
 	foreach (var extension in new string[]{"pdb", "config", "xml"})
 		DeleteFiles(_outputDir.Path + "/*." + extension);
 });