Tidy up project files; Remove GitHub copyright from produced binaries

This commit is contained in:
Caelan Sayler
2021-12-12 10:48:03 +00:00
parent 9e653e5984
commit d57e39c1d9
5 changed files with 7 additions and 29 deletions

View File

@@ -23,22 +23,15 @@ dotnet publish -v minimal -c Release -r win-x86 --self-contained=true "$PSScript
dotnet publish -v minimal -c Release -r win-x86 --self-contained=true "$PSScriptRoot\src\SquirrelCli\SquirrelCli.csproj" -o "$Out"
# Copy over all files we need
# Move-Item "$Out\Update.exe" -Destination "$Out\Squirrel.exe"
# Move-Item "$Out\Update.com" -Destination "$Out\Squirrel.com"
# Move-Item "$Out\Update.pdb" -Destination "$Out\Squirrel.pdb"
# New-Item -Path "$Out\lib" -ItemType "directory" | Out-Null
# Copy-Item -Path "$In\netstandard2.0\*" -Destination "$Out\lib" -Recurse
Copy-Item "$In\Win32\Setup.exe" -Destination "$Out"
Copy-Item "$In\Win32\Setup.pdb" -Destination "$Out"
# Copy-Item "$In\Win32\Setup.pdb" -Destination "$Out"
Copy-Item "$In\Win32\StubExecutable.exe" -Destination "$Out"
Copy-Item "$In\Win32\WriteZipToSetup.exe" -Destination "$Out"
Copy-Item "$In\Win32\WriteZipToSetup.pdb" -Destination "$Out"
# Copy-Item "$In\Win32\WriteZipToSetup.pdb" -Destination "$Out"
Copy-Item -Path "$PSScriptRoot\vendor\7zip\*" -Destination "$Out" -Recurse
# Copy-Item -Path "$PSScriptRoot\vendor\wix\*" -Destination "$Out" -Recurse
Copy-Item "$PSScriptRoot\vendor\NuGet.exe" -Destination "$Out"
Copy-Item "$PSScriptRoot\vendor\nuget.exe" -Destination "$Out"
Copy-Item "$PSScriptRoot\vendor\rcedit.exe" -Destination "$Out"
Copy-Item "$PSScriptRoot\vendor\signtool.exe" -Destination "$Out"
Copy-Item "$PSScriptRoot\vendor\singlefilehost.exe" -Destination "$Out"

View File

@@ -2,25 +2,20 @@
<Project>
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<EnableSourceLink Condition=" '$(NCrunch)' == '1' ">false</EnableSourceLink>
<ProjectName Condition=" '$(ProjectName)' == '' ">$(MSBuildProjectName)</ProjectName>
<BaseOutputPath>$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\build\))</BaseOutputPath>
<BaseIntermediateOutputPath>$(BaseOutputPath)obj\$(ProjectName)\</BaseIntermediateOutputPath>
<OutputPath>$(BaseOutputPath)$(Configuration)\</OutputPath>
<LangVersion>9.0</LangVersion>
<LangVersion>9</LangVersion>
<SignAssembly>True</SignAssembly>
<AssemblyOriginatorKeyFile>..\..\Squirrel.snk</AssemblyOriginatorKeyFile>
<AppendTargetFrameworkToOutputPath>true</AppendTargetFrameworkToOutputPath>
<AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
<Company>GitHub</Company>
<Copyright>Copyright © GitHub 2013-2015</Copyright>
<PackageLicenseExpression>MS-RL</PackageLicenseExpression>
<Product>Squirrel</Product>
</PropertyGroup>
<ItemGroup Condition=" '$(MSBuildProjectExtension)'=='.csproj' ">
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
<PackageReference Include="Nerdbank.GitVersioning" Version="3.4.244" PrivateAssets="All" />
</ItemGroup>

View File

@@ -3,13 +3,10 @@
<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<LangVersion>9</LangVersion>
<Description>Squirrel</Description>
<Title>Squirrel</Title>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<AssemblyName>SquirrelLib</AssemblyName>
<SignAssembly>True</SignAssembly>
<AssemblyOriginatorKeyFile>..\..\Squirrel.snk</AssemblyOriginatorKeyFile>
</PropertyGroup>
<ItemGroup>

View File

@@ -3,13 +3,10 @@
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<OutputType>Exe</OutputType>
<LangVersion>9</LangVersion>
<AssemblyName>Squirrel</AssemblyName>
<ApplicationManifest>app.manifest</ApplicationManifest>
<ApplicationIcon>..\..\squirrel.ico</ApplicationIcon>
<SatelliteResourceLanguages>en</SatelliteResourceLanguages>
<SignAssembly>True</SignAssembly>
<AssemblyOriginatorKeyFile>..\..\Squirrel.snk</AssemblyOriginatorKeyFile>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<PublishSingleFile>true</PublishSingleFile>
<PublishTrimmed>true</PublishTrimmed>

View File

@@ -1,15 +1,11 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net6.0-windows</TargetFramework>
<OutputType>WinExe</OutputType>
<LangVersion>9</LangVersion>
<RootNamespace>Squirrel.Update</RootNamespace>
<ApplicationManifest>app.manifest</ApplicationManifest>
<NoWarn>CA1416</NoWarn>
<SatelliteResourceLanguages>en</SatelliteResourceLanguages>
<SignAssembly>True</SignAssembly>
<AssemblyOriginatorKeyFile>..\..\Squirrel.snk</AssemblyOriginatorKeyFile>
<PublishSingleFile>true</PublishSingleFile>
<PublishTrimmed>true</PublishTrimmed>
<EnableCompressionInSingleFile>true</EnableCompressionInSingleFile>