Merge branch 'release/1.0.3'

hightechict · Sep 13, 2019 · be28078 · be28078
2 parents e37e8c2 + 45cb56b
commit be28078
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 11 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -0,0 +1,24 @@
+<Project>
+
+  <PropertyGroup>
+    <DebugType>embedded</DebugType>
+    <DebugSymbols>true</DebugSymbols>
+    <TreatWarningsAsErrors>True</TreatWarningsAsErrors>
+    <TreatSpecificWarningsAsErrors />
+    <RestoreProjectStyle>PackageReference</RestoreProjectStyle>
+    <GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
+    <GenerateAssemblyInformationalVersionAttribute>false</GenerateAssemblyInformationalVersionAttribute>
+    <GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <Copyright>Copyright 2019 Hightech ICT</Copyright>
+    <Authors>Hightech ICT and authors</Authors>
+  </PropertyGroup>
+
+  <!-- PACKAGE AND VERSION CREATION -->
+  <ItemGroup>
+    <Compile Include="..\..\built\SharedAssemblyInfo*.cs" Link="SharedAssemblyInfo.cs" />
+  </ItemGroup>
+
+</Project>
diff --git a/build.ps1 b/build.ps1
@@ -1,5 +1,4 @@
 function New-Package($version) {
-    New-SharedAssemblyInfo $version
     dotnet pack --output ../../built --configuration Release /p:PackageVersion="$($version.FullSemVer)" /p:NoPackageAnalysis=true
 } 
 
@@ -21,16 +20,18 @@ using System.Runtime.InteropServices;
 }
 
 
+$version = git-flow-version | ConvertFrom-Json
+Write-Host "calculated version:"
+$version | Format-List
+
 Remove-Item built -Force -Recurse -ErrorAction SilentlyContinue
 Remove-Item doc/index.md -Force -Recurse -ErrorAction SilentlyContinue  
 Remove-Item doc/_site -Force -Recurse -ErrorAction SilentlyContinue
 Remove-Item doc/obj -Force -Recurse -ErrorAction SilentlyContinue    
 dotnet clean 
 dotnet restore
+New-SharedAssemblyInfo $version
 dotnet build --configuration Release .\src\Tring.WinExe\Tring.WinExe.csproj /p:OutputPath="..\..\built" 
 dotnet test /p:CollectCoverage=true /p:Exclude=[xunit.*]* /p:CoverletOutput='../../built/Tring.xml' /p:CoverletOutputFormat=cobertura
 
-$version = git-flow-version | ConvertFrom-Json
-Write-Host "calculated version:"
-$version | Format-List
 New-Package $version
diff --git a/hightechict.ico b/hightechict.ico
diff --git a/src/Tring.WinExe/Tring.WinExe.csproj b/src/Tring.WinExe/Tring.WinExe.csproj
@@ -24,15 +24,9 @@ along with Tring. If not, see<https://www.gnu.org/licenses/>.
     <Title>Tring</Title>
     <TargetName>tring</TargetName>
     <Description>Tring can be used to quickly test a TCP connection.</Description>
-    <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
-    <PackageLicenseExpression>LGPL-3.0-or-later</PackageLicenseExpression>
-    <RepositoryUrl>https://github.com/hightechict/Tring</RepositoryUrl>
-	<PackageProjectUrl>https://github.com/hightechict/Tring</PackageProjectUrl>
-    <RepositoryType>git</RepositoryType>
     <Copyright>Copyright 2019 Hightech ICT</Copyright>
     <Authors>Hightech ICT and authors</Authors>
-    <PackageIconUrl>https://raw.githubusercontent.com/hightechict/DashDashVersion/develop/doc/images/HightechICT.png</PackageIconUrl>
-    <PackageTags>TCP;Network</PackageTags>
+    <ApplicationIcon>../../hightechict.ico</ApplicationIcon>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
     <DebugType>none</DebugType>