diff --git a/build/Version.props b/build/Version.props index d032e1fc4..c66dd2704 100644 --- a/build/Version.props +++ b/build/Version.props @@ -4,6 +4,7 @@ 11.2.5 0.0.2 false + $([System.DateTime]::Now.ToString("yyyyMMddHHmm")) false @@ -13,7 +14,11 @@ $(AtomUIVersion) - $(AtomUIVersion)-build.$([System.DateTime]::Now.ToString("yyyyMMddHHmmss")) + $(AtomUIVersion)-build.$(BuildTimestamp) + + + + $(AtomUIVersion) diff --git a/scripts/BuildAtomUINative.ps1 b/scripts/BuildAtomUINative.ps1 index 18833ae49..f410c9f2f 100644 --- a/scripts/BuildAtomUINative.ps1 +++ b/scripts/BuildAtomUINative.ps1 @@ -29,8 +29,8 @@ try { return } } catch [System.IO.IOException] { - if (Test-Path $path) { - Write-Host "目录已被其他进程创建: $path" + if (Test-Path $buildMarker) { + Write-Host "目录已被其他进程创建: $buildMarker" } else { Write-Host "创建失败: $_,跳过编译" } diff --git a/scripts/PublishToLocalSources.ps1 b/scripts/PublishToLocalSources.ps1 index 261ce29af..5aed299c4 100644 --- a/scripts/PublishToLocalSources.ps1 +++ b/scripts/PublishToLocalSources.ps1 @@ -3,8 +3,12 @@ param ( [string]$buildType = "Release" ) -dotnet build -v diag --configuration $buildType ../AtomUI.sln -dotnet pack --no-build --configuration $buildType /p:IsNightlyBuild=true ../packages/AtomUI/AtomUI.csproj +$buildTimestamp = Get-Date -Format 'yyyyMMddHHmm' + +dotnet build -v diag --configuration $buildType ../packages/AtomUI/AtomUI.csproj +dotnet pack --no-build --configuration $buildType /p:IsNightlyBuild=true /p:BuildTimestamp=$buildTimestamp ../packages/AtomUI/AtomUI.csproj +dotnet pack --no-build --configuration $buildType /p:IsNightlyBuild=true /p:BuildTimestamp=$buildTimestamp ../src/AtomUI.IconPkg.Generator/AtomUI.IconPkg.Generator.csproj +dotnet pack --no-build --configuration $buildType /p:IsNightlyBuild=true /p:BuildTimestamp=$buildTimestamp ../src/AtomUI.Generator/AtomUI.Generator.csproj # 探测包 $packages = Get-ChildItem -Path ../output/Nuget -Filter *.nupkg -Recurse -File diff --git a/src/AtomUI.Controls/AtomUI.Controls.csproj b/src/AtomUI.Controls/AtomUI.Controls.csproj index 64f88c085..f562db98d 100644 --- a/src/AtomUI.Controls/AtomUI.Controls.csproj +++ b/src/AtomUI.Controls/AtomUI.Controls.csproj @@ -22,7 +22,10 @@ - + diff --git a/src/AtomUI.Generator/AtomUI.Generator.csproj b/src/AtomUI.Generator/AtomUI.Generator.csproj index 2bcfe702b..1bb8c5262 100644 --- a/src/AtomUI.Generator/AtomUI.Generator.csproj +++ b/src/AtomUI.Generator/AtomUI.Generator.csproj @@ -4,6 +4,7 @@ netstandard2.0 true true + true false diff --git a/src/AtomUI.IconPkg.AntDesign/AtomUI.IconPkg.AntDesign.csproj b/src/AtomUI.IconPkg.AntDesign/AtomUI.IconPkg.AntDesign.csproj index 6dc871d2b..2cfef2c7b 100644 --- a/src/AtomUI.IconPkg.AntDesign/AtomUI.IconPkg.AntDesign.csproj +++ b/src/AtomUI.IconPkg.AntDesign/AtomUI.IconPkg.AntDesign.csproj @@ -15,7 +15,10 @@ - + diff --git a/src/AtomUI.IconPkg.Generator/AtomUI.IconPkg.Generator.csproj b/src/AtomUI.IconPkg.Generator/AtomUI.IconPkg.Generator.csproj index 38bc76c95..3456513da 100644 --- a/src/AtomUI.IconPkg.Generator/AtomUI.IconPkg.Generator.csproj +++ b/src/AtomUI.IconPkg.Generator/AtomUI.IconPkg.Generator.csproj @@ -4,6 +4,7 @@ netstandard2.0 true true + true false diff --git a/src/AtomUI.Theme/AtomUI.Theme.csproj b/src/AtomUI.Theme/AtomUI.Theme.csproj index de7d0e64b..747e66d3d 100644 --- a/src/AtomUI.Theme/AtomUI.Theme.csproj +++ b/src/AtomUI.Theme/AtomUI.Theme.csproj @@ -14,7 +14,10 @@ - +