fix packages publishing

everscale-actions · Nov 13, 2020 · 061d2bf · 061d2bf
1 parent a618317
commit 061d2bf
Show file tree

Hide file tree

Showing 10 changed files with 44 additions and 28 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -45,7 +45,7 @@ jobs:
       run: dotnet test -c Release --no-restore --no-build
 
     - name: Pack
-      run: dotnet pack -v normal -c Release --no-restore --no-build --include-symbols --include-source -p:PackageVersion=$GITHUB_RUN_ID -o pack src/$PROJECT_NAME
+      run: dotnet pack -v normal -c Release --no-restore --no-build --include-symbols --include-source -p:PackageVersion=$GITHUB_RUN_ID -o pack
 
     - name: Publish Sample Site
       run: dotnet publish -c Release --no-restore --no-build samples/WebApplication -o publish
@@ -103,7 +103,7 @@ jobs:
           echo Version: $VERSION
           VERSION="${VERSION//v}"
           echo Clean Version: $VERSION
-          dotnet pack -v normal -c Release --include-symbols --include-source -p:PackageVersion=$VERSION -o nupkg src/$PROJECT_NAME/$PROJECT_NAME.csproj
+          dotnet pack -v normal -c Release --include-symbols --include-source -p:PackageVersion=$VERSION -o nupkg
       - name: Push to GitHub Feed
         run: |
           for f in ./nupkg/*.nupkg

diff --git a/PackageInfo.targets b/PackageInfo.targets
@@ -0,0 +1,20 @@
+<Project>
+    <PropertyGroup>
+        <Authors>Alexander Salamatov</Authors>
+        <Copyright>Copyright 2020 (c) Alexander Salamatov. All rights reserved.</Copyright>
+
+        <Description>Free TON Client for Blazor</Description>
+        <IncludeSymbols>true</IncludeSymbols>
+        <SymbolPackageFormat>snupkg</SymbolPackageFormat>
+
+        <PackageTags>FREETON;TON;Blazor;Razor;Components;CSharp;Wasm</PackageTags>
+        <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
+        <PackageProjectUrl>https://github.com/ch1seL/TonClientBlazor</PackageProjectUrl>
+        <PackageIcon>icon.png</PackageIcon>
+        <RepositoryType>git</RepositoryType>
+        <RepositoryUrl>https://github.com/ch1seL/TonClientBlazor</RepositoryUrl>
+
+        <PublishRepositoryUrl>true</PublishRepositoryUrl>
+        <EmbedUntrackedSources>true</EmbedUntrackedSources>
+    </PropertyGroup>
+</Project>
diff --git a/TonClientBlazor.sln b/TonClientBlazor.sln
@@ -22,6 +22,11 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TonClientBlazor.Utils", "sr
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebApplication", "samples\WebApplication\WebApplication.csproj", "{B4EDA8C5-7F82-4501-91A4-A84392F2172B}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "_CommonTargets", "_CommonTargets", "{6D258042-25EF-481D-BFEE-6EE52322780D}"
+ProjectSection(SolutionItems) = preProject
+	PackageInfo.targets = PackageInfo.targets
+EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU

diff --git a/src/TonClientBlazor.Abstract/TonClientBlazor.Abstract.csproj b/src/TonClientBlazor.Abstract/TonClientBlazor.Abstract.csproj
@@ -3,6 +3,7 @@
     <PropertyGroup>
         <TargetFramework>netstandard2.1</TargetFramework>
         <RootNamespace>ch1seL.TonClientBlazor</RootNamespace>
+        <AssemblyName>ch1seL.TonClientBlazor.Abstract</AssemblyName>
     </PropertyGroup>
 
     <ItemGroup>
@@ -15,13 +16,13 @@
 
     <ItemGroup>
         <AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleTo">
-            <_Parameter1>TonClientBlazor</_Parameter1>
+            <_Parameter1>ch1seL.TonClientBlazor</_Parameter1>
         </AssemblyAttribute>
         <AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleTo">
-            <_Parameter1>TonClientBlazor.Adapter</_Parameter1>
+            <_Parameter1>ch1seL.TonClientBlazor.Adapter</_Parameter1>
         </AssemblyAttribute>
         <AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleTo">
-            <_Parameter1>TonClientBlazor.Mediator</_Parameter1>
+            <_Parameter1>ch1seL.TonClientBlazor.Mediator</_Parameter1>
         </AssemblyAttribute>
     </ItemGroup>
 

diff --git a/src/TonClientBlazor.Adapter/TonClientBlazor.Adapter.csproj b/src/TonClientBlazor.Adapter/TonClientBlazor.Adapter.csproj
@@ -3,6 +3,7 @@
     <PropertyGroup>
         <TargetFramework>net5.0</TargetFramework>
         <RootNamespace>ch1seL.TonClientBlazor</RootNamespace>
+        <AssemblyName>ch1seL.TonClientBlazor.Adapter</AssemblyName>
     </PropertyGroup>
 
     <ItemGroup>
@@ -16,7 +17,7 @@
 
     <ItemGroup>
         <AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleTo">
-            <_Parameter1>TonClientBlazor</_Parameter1>
+            <_Parameter1>ch1seL.TonClientBlazor</_Parameter1>
         </AssemblyAttribute>
     </ItemGroup>
 

diff --git a/src/TonClientBlazor.Domain/TonClientBlazor.Domain.csproj b/src/TonClientBlazor.Domain/TonClientBlazor.Domain.csproj
@@ -3,6 +3,7 @@
     <PropertyGroup>
         <TargetFramework>netstandard2.1</TargetFramework>
         <RootNamespace>ch1seL.TonClientBlazor</RootNamespace>
+        <AssemblyName>ch1seL.TonClientBlazor.Domain</AssemblyName>
     </PropertyGroup>
 
     <ItemGroup>

diff --git a/src/TonClientBlazor.Mediator/TonClientBlazor.Mediator.csproj b/src/TonClientBlazor.Mediator/TonClientBlazor.Mediator.csproj
@@ -3,14 +3,15 @@
     <PropertyGroup>
         <TargetFramework>netstandard2.1</TargetFramework>
         <RootNamespace>ch1seL.TonClientBlazor.Mediator</RootNamespace>
+        <AssemblyName>ch1seL.TonClientBlazor.Mediator</AssemblyName>
     </PropertyGroup>
 
     <ItemGroup>
         <AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleTo">
-            <_Parameter1>TonClientBlazor</_Parameter1>
+            <_Parameter1>ch1seL.TonClientBlazor</_Parameter1>
         </AssemblyAttribute>
         <AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleTo">
-            <_Parameter1>TonClientBlazor.Modules</_Parameter1>
+            <_Parameter1>ch1seL.TonClientBlazor.Modules</_Parameter1>
         </AssemblyAttribute>
     </ItemGroup>
 

diff --git a/src/TonClientBlazor.Modules/TonClientBlazor.Modules.csproj b/src/TonClientBlazor.Modules/TonClientBlazor.Modules.csproj
@@ -2,7 +2,8 @@
 
     <PropertyGroup>
         <TargetFramework>netstandard2.1</TargetFramework>
-        <RootNamespace>ch1seL.TonClientModules</RootNamespace>
+        <RootNamespace>ch1seL.TonClientBlazor</RootNamespace>
+        <AssemblyName>ch1seL.TonClientBlazor.Modules</AssemblyName>
     </PropertyGroup>
 
     <ItemGroup>
@@ -12,7 +13,7 @@
 
     <ItemGroup>
         <AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleTo">
-            <_Parameter1>TonClientBlazor</_Parameter1>
+            <_Parameter1>ch1seL.TonClientBlazor</_Parameter1>
         </AssemblyAttribute>
     </ItemGroup>
 

diff --git a/src/TonClientBlazor.Utils/TonClientBlazor.Utils.csproj b/src/TonClientBlazor.Utils/TonClientBlazor.Utils.csproj
@@ -3,6 +3,7 @@
     <PropertyGroup>
         <TargetFramework>netstandard2.1</TargetFramework>
         <RootNamespace>ch1seL.TonClientBlazor.Utils</RootNamespace>
+        <AssemblyName>ch1seL.TonClientBlazor.Utils</AssemblyName>
     </PropertyGroup>
 
 </Project>
diff --git a/src/TonClientBlazor/TonClientBlazor.csproj b/src/TonClientBlazor/TonClientBlazor.csproj
@@ -3,26 +3,11 @@
     <PropertyGroup>
         <TargetFramework>net5.0</TargetFramework>
         <RootNamespace>ch1seL.TonClientBlazor</RootNamespace>
-
-        <Authors>Alexander Salamatov</Authors>        
-        <Copyright>Copyright 2020 (c) Alexander Salamatov. All rights reserved.</Copyright>
-
-        <Description>Free TON Client for Blazor</Description>
-        <IncludeSymbols>true</IncludeSymbols>
-        <SymbolPackageFormat>snupkg</SymbolPackageFormat>
-
-        <PackageId>ch1seL.TonClientBlazor</PackageId>
-        <PackageTags>FREETON;TON;Blazor;Razor;Components;CSharp;Wasm</PackageTags>
-        <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
-        <PackageProjectUrl>https://github.com/ch1seL/TonClientBlazor</PackageProjectUrl>
-        <PackageIcon>icon.png</PackageIcon>
-        <RepositoryType>git</RepositoryType>
-        <RepositoryUrl>https://github.com/ch1seL/TonClientBlazor</RepositoryUrl>
-
-        <PublishRepositoryUrl>true</PublishRepositoryUrl>
-        <EmbedUntrackedSources>true</EmbedUntrackedSources>
+        <AssemblyName>ch1seL.TonClientBlazor</AssemblyName>       
     </PropertyGroup>
 
+    <Import Project="..\..\PackageInfo.targets" />
+
     <ItemGroup>
         <PackageReference Include="MediatR.Extensions.Microsoft.DependencyInjection" Version="9.0.0" />
         <PackageReference Include="Microsoft.Extensions.Logging" Version="5.0.0" />