github
/
winsw
mirror of https://github.com/winsw/winsw
1
0
Fork 0
Code Issues Releases Wiki Activity

Rename framework-dependent deliverables

pull/740/head
NextTurn 2020-03-12 00:00:00 +08:00 committed by Next Turn
parent cb8ded23c7
commit 599a52c70e
4 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
WinSW.nuspec
View File

@ -25,7 +25,7 @@ More info about the wrapper is available in the projects GitHub repository.
</dependencies> </dependencies>
</metadata> </metadata>
<files> <files>
<file src="artifacts\publish\WinSW.NET461.exe" target="lib\net461\WinSW.NET461.exe" /> <file src="artifacts\publish\WinSW-net461.exe" target="lib\net461\WinSW-net461.exe" />
<file src="samples\sample-complete.xml" target="lib\net461\WinSW.NET461.xml" /> <file src="samples\sample-complete.xml" target="lib\net461\WinSW-net461.xml" />
</files> </files>
</package> </package>

4
eng/build.yml
View File

@ -59,8 +59,8 @@ jobs:
versioningScheme: byEnvVar versioningScheme: byEnvVar
versionEnvVar: BuildVersion versionEnvVar: BuildVersion
- publish: artifacts\publish\WinSW.NET461.exe - publish: artifacts\publish\WinSW-net461.exe
artifact: WinSW.NET461.exe_$(BuildConfiguration) artifact: WinSW-net461.exe_$(BuildConfiguration)
displayName: Publish .NET 4.6.1 displayName: Publish .NET 4.6.1
- publish: artifacts\publish\WinSW-x64.zip - publish: artifacts\publish\WinSW-x64.zip

2
src/WinSW.Tests/Util/Layout.cs
View File

@ -36,7 +36,7 @@ namespace WinSW.Tests.Util
internal static string ArtifactsDirectory => artifactsDirectory ??= Path.Combine(RepositoryRoot, "artifacts"); internal static string ArtifactsDirectory => artifactsDirectory ??= Path.Combine(RepositoryRoot, "artifacts");
internal static string NET461Exe => Path.Combine(ArtifactsDirectory, "publish", "WinSW.NET461.exe"); internal static string NET461Exe => Path.Combine(ArtifactsDirectory, "publish", "WinSW-net461.exe");
internal static string WinSWExe => internal static string WinSWExe =>
#if NET #if NET

8
src/WinSW/WinSW.csproj
View File

@ -65,10 +65,6 @@
<!-- Merge plugins and other DLLs into the executable --> <!-- Merge plugins and other DLLs into the executable -->
<Target Name="Merge" BeforeTargets="AfterBuild" Condition="'$(TargetFramework)' != 'net5.0-windows'"> <Target Name="Merge" BeforeTargets="AfterBuild" Condition="'$(TargetFramework)' != 'net5.0-windows'">
<PropertyGroup Condition="'$(TargetFramework)' == 'net461'">
<TargetFrameworkSuffix>NET461</TargetFrameworkSuffix>
</PropertyGroup>
<PropertyGroup> <PropertyGroup>
<InputAssemblies>"$(OutDir)$(TargetFileName)"</InputAssemblies> <InputAssemblies>"$(OutDir)$(TargetFileName)"</InputAssemblies>
<InputAssemblies>$(InputAssemblies) "$(OutDir)WinSW.Core.dll"</InputAssemblies> <InputAssemblies>$(InputAssemblies) "$(OutDir)WinSW.Core.dll"</InputAssemblies>
@ -80,7 +76,7 @@
<InputAssemblies>$(InputAssemblies) "$(OutDir)System.Numerics.Vectors.dll"</InputAssemblies> <InputAssemblies>$(InputAssemblies) "$(OutDir)System.Numerics.Vectors.dll"</InputAssemblies>
<InputAssemblies>$(InputAssemblies) "$(OutDir)System.Runtime.CompilerServices.Unsafe.dll"</InputAssemblies> <InputAssemblies>$(InputAssemblies) "$(OutDir)System.Runtime.CompilerServices.Unsafe.dll"</InputAssemblies>
<InputAssemblies>$(InputAssemblies) "$(OutDir)System.ValueTuple.dll"</InputAssemblies> <InputAssemblies>$(InputAssemblies) "$(OutDir)System.ValueTuple.dll"</InputAssemblies>
<OutputAssembly>"$(ArtifactsPublishDir)WinSW.$(TargetFrameworkSuffix).exe"</OutputAssembly> <OutputAssembly>"$(ArtifactsPublishDir)WinSW-$(TargetFramework).exe"</OutputAssembly>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
@ -96,7 +92,7 @@
<UsingTask TaskName="WinSW.Tasks.Trim" AssemblyFile="$(ArtifactsBinDir)WinSW.Tasks\$(Configuration)\net461\WinSW.Tasks.dll" /> <UsingTask TaskName="WinSW.Tasks.Trim" AssemblyFile="$(ArtifactsBinDir)WinSW.Tasks\$(Configuration)\net461\WinSW.Tasks.dll" />
<Target Name="Trim" AfterTargets="Merge" Condition="'$(TargetFramework)' != 'net5.0-windows'"> <Target Name="Trim" AfterTargets="Merge" Condition="'$(TargetFramework)' != 'net5.0-windows'">
<Trim Path="$(ArtifactsPublishDir)WinSW.$(TargetFrameworkSuffix).exe" /> <Trim Path="$(ArtifactsPublishDir)WinSW-$(TargetFramework).exe" />
</Target> </Target>
</Project> </Project>