Skip to content

Commit

Permalink
WIP
Browse files Browse the repository at this point in the history
  • Loading branch information
s2quake committed Jun 26, 2024
1 parent 489cc52 commit 9173b63
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 6 deletions.
3 changes: 2 additions & 1 deletion .github/bin/dist-pack.sh
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,10 @@ for project in "${projects[@]}"; do
if [[ "$version_suffix" = "" ]]; then
dotnet_args="-p:Version=$version"
else
dotnet_args="-p:VersionPrefix=$version_prefix" \
dotnet_args="-p:VersionPrefix=$version_prefix"
dotnet_args="$dotnet_args --version-suffix=$version_suffix"
dotnet_args="$dotnet_args -p:NoPackageAnalysis=true"
dotnet_args="$dotnet_args -p:_IsPacking=true"
fi
# shellcheck disable=SC2086
dotnet build -c "$configuration" $dotnet_args || \
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
on:
push:
branches:
- "main"
- "chore/common-properties"
tags:
- "*"
name: Build artifact and push
Expand Down
4 changes: 1 addition & 3 deletions scripts/determine-version.js
Original file line number Diff line number Diff line change
Expand Up @@ -76,9 +76,7 @@ function getScheduledJobDate() {
async function main() {
const csprojPath = path.join(
path.dirname(__dirname),
"src",
"Libplanet",
"Libplanet.csproj",
"Directory.Build.props",
);
const versionPrefix = await readVersionPrefix(csprojPath);
const scheduledJobDate = getScheduledJobDate();
Expand Down
11 changes: 11 additions & 0 deletions test/Libplanet.Mocks/Libplanet.Mocks.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
<PropertyGroup>
<TargetFrameworks Condition="'$(_IsPacking)'=='true'">$(TargetFrameworks);netstandard2.0;netstandard2.1</TargetFrameworks>
<IsPackable>true</IsPackable>
<IsTestProject>false</IsTestProject>
<IsPublishable>true</IsPublishable>
</PropertyGroup>

<ItemGroup>
Expand All @@ -15,6 +17,15 @@
<PackageReference Remove="SonarAnalyzer.CSharp" />
</ItemGroup>

<ItemGroup>
<PackageReference Remove="JunitXml.TestLogger" />
<PackageReference Remove="Microsoft.NET.Test.Sdk" />
<PackageReference Remove="xunit" />
<PackageReference Remove="xunit.runner.visualstudio" />
<PackageReference Remove="xunit.extensibility.execution" />
<PackageReference Remove="coverlet.collector" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\src\Libplanet.Action\Libplanet.Action.csproj" />
<ProjectReference Include="..\..\src\Libplanet.Common\Libplanet.Common.csproj" />
Expand Down
2 changes: 1 addition & 1 deletion tools/Libplanet.Tools/Libplanet.Tools.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<AssemblyName>planet</AssemblyName>
</PropertyGroup>

<PropertyGroup Condition=" '$(PublishSingleFile)' == 'true' And&#xD;&#xA; '$(RuntimeIdentifier.Substring(0, 6))' == 'linux-' ">
<PropertyGroup Condition=" '$(PublishSingleFile)' == 'true' And '$(RuntimeIdentifier).Substring(0, 6)' == 'linux-' ">
<InvariantGlobalization>true</InvariantGlobalization>
</PropertyGroup>

Expand Down

0 comments on commit 9173b63

Please sign in to comment.