Skip to content

Commit bb6ecec

Browse files
committed
Reduce DevExpress references
1 parent 3f4c8b9 commit bb6ecec

File tree

3 files changed

+16
-10
lines changed

3 files changed

+16
-10
lines changed

Fusion++.Tests/Properties/AssemblyInfo.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515

1616
[assembly: Guid("967e8901-43de-4af1-86df-bb18c8949c44")]
1717

18-
// [assembly: AssemblyVersion("1.1.1.0")]
19-
[assembly: AssemblyVersion("1.1.1.0")]
20-
[assembly: AssemblyFileVersion("1.1.1.0")]
18+
// [assembly: AssemblyVersion("1.2.0.0")]
19+
[assembly: AssemblyVersion("1.2.0.0")]
20+
[assembly: AssemblyFileVersion("1.2.0.0")]
2121

22-
[assembly: AssemblyInformationalVersion("1.1.1-netcore.1+17.Branch.feature/netcore.Sha.09126cceaac7471eac58c87cdd14143fe198120f")]
22+
[assembly: AssemblyInformationalVersion("1.2.0+Branch.master.Sha.3f4c8b95ce6955674493af180e6242e95fe6b84d")]

Fusion++/Fusion++.csproj

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,20 @@
1-
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
1+
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
22

33
<PropertyGroup>
44
<OutputType>WinExe</OutputType>
55
<TargetFramework>netcoreapp3.1</TargetFramework>
66
<RootNamespace>FusionPlusPlus</RootNamespace>
77
<UseWindowsForms>true</UseWindowsForms>
88
<ApplicationManifest>app.manifest</ApplicationManifest>
9-
<AssemblyVersion>1.1.0.0</AssemblyVersion>
10-
<Version>1.1.0</Version>
11-
<FileVersion>1.1.0.0</FileVersion>
9+
<AssemblyVersion>1.2</AssemblyVersion>
10+
<Version>1.2.0.0</Version>
11+
<FileVersion>1.2.0.0</FileVersion>
1212
</PropertyGroup>
1313

1414
<ItemGroup>
15-
<PackageReference Include="DevExpress.WindowsDesktop.Win" Version="19.2.6-ctp" />
15+
<PackageReference Include="DevExpress.WindowsDesktop.Win.Bars" Version="19.2.6-ctp" />
16+
<PackageReference Include="DevExpress.WindowsDesktop.Win.Grid" Version="19.2.6-ctp" />
17+
<PackageReference Include="DevExpress.WindowsDesktop.Win.RichEdit" Version="19.2.6-ctp" />
1618
</ItemGroup>
1719

1820
<ItemGroup>

build.cake

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,10 @@ Task("SetVersion")
6060
_appVersion = $"{gitVersion.Major}.{gitVersion.Minor}" + (gitVersion.Patch == 0 ? "" : $".{gitVersion.Patch}");
6161
var fullVersion = gitVersion.AssemblySemVer;
6262

63+
ReplaceRegexInFiles("./**/*.csproj", "(?<=<AssemblyVersion>).*?(?=</AssemblyVersion>)", _appVersion);
64+
ReplaceRegexInFiles("./**/*.csproj", "(?<=<Version>).*?(?=</Version>)", fullVersion);
65+
ReplaceRegexInFiles("./**/*.csproj", "(?<=<FileVersion>).*?(?=</FileVersion>)", fullVersion);
66+
6367
Information($"AppVersion:\t{_appVersion}");
6468
Information($"FullVersion:\t{fullVersion}");
6569
});
@@ -138,7 +142,7 @@ Task("Publish")
138142

139143
// files are published to Fusion++\bin\Release\netcoreapp3.1\win-x64\publish
140144
CopyFiles($"./Fusion++/bin/{configuration}/{netcoreTargetFramework}/{settings.Runtime}/publish/**/*", _outputDir, true);
141-
145+
142146
foreach (var extension in new string[]{"pdb", "config", "xml"})
143147
DeleteFiles(_outputDir.Path + "/*." + extension);
144148
});

0 commit comments

Comments
 (0)