Skip to content

Commit

Permalink
Keep local copy of signclient to avoid issues with teamcity
Browse files Browse the repository at this point in the history
  • Loading branch information
xen2 committed Feb 8, 2023
1 parent 441fb47 commit c6431b8
Show file tree
Hide file tree
Showing 66 changed files with 3,839 additions and 13 deletions.
4 changes: 2 additions & 2 deletions build/.nuget/NuGet.exe
Git LFS file not shown
14 changes: 5 additions & 9 deletions build/Stride.build
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ Example of use:
<!--
Package Installer: install-prerequisites.exe
-->
<Target Name="PrerequisitesInstaller" DependsOnTargets="DownloadSignClient;SignCredentialsCheck">
<Target Name="PrerequisitesInstaller" DependsOnTargets="SignCredentialsCheck">
<Delete Files="$(StrideRoot)Bin\Prerequisites\install-prerequisites.exe"/>
<Exec Command='"$(AdvancedInstallerPath)" /rebuild "$(StrideRoot)sources\prerequisites\prerequisites.aip"' EnvironmentVariables="StrideSignUser=&quot;$(StrideSignUser)&quot;;StrideSignSecret=&quot;$(StrideSignSecret)&quot;"/>
<!-- Note: this exe will be signed as part of GameStudio.nupkg -->
Expand Down Expand Up @@ -328,7 +328,7 @@ Example of use:
<!--
Package Installer: StrideSetup.exe
-->
<Target Name="PackageInstaller" DependsOnTargets="PackageLauncher;DownloadSignClient;SignCredentialsCheck">
<Target Name="PackageInstaller" DependsOnTargets="PackageLauncher;SignCredentialsCheck">
<!-- Run advanced installer -->
<Exec Command='"$(AdvancedInstallerPath)" /rebuild "$(StrideRoot)sources\launcher\Setup\setup.aip"' EnvironmentVariables="StrideSignUser=&quot;$(StrideSignUser)&quot;;StrideSignSecret=&quot;$(StrideSignSecret)&quot;"/>

Expand All @@ -338,7 +338,7 @@ Example of use:
<!--
Package Installer: launcher-prerequisites.exe
-->
<Target Name="LauncherPrerequisitesInstaller" DependsOnTargets="DownloadSignClient;SignCredentialsCheck">
<Target Name="LauncherPrerequisitesInstaller" DependsOnTargets="SignCredentialsCheck">
<Exec Command='"$(AdvancedInstallerPath)" /rebuild "$(StrideRoot)sources\launcher\Prerequisites\launcher-prerequisites.aip"' EnvironmentVariables="StrideSignUser=&quot;$(StrideSignUser)&quot;;StrideSignSecret=&quot;$(StrideSignSecret)&quot;"/>
</Target>

Expand All @@ -358,24 +358,20 @@ Example of use:
<Exec Command='"$(NuGetPath)" push ..\bin\launcher\*.nupkg -ApiKey $(StrideStoreApiKey) -Source $(StrideStoreUrl) -NoSymbols'/>
</Target>

<Target Name="BuildLauncher" DependsOnTargets="DownloadSignClient;SignCredentialsCheck">
<Target Name="BuildLauncher" DependsOnTargets="SignCredentialsCheck">
<PropertyGroup>
<StrideSolution>Stride.Launcher</StrideSolution>
</PropertyGroup>
<MSBuild Targets="Restore" Projects="$(MSBuildThisFileFullPath)" Properties="StridePlatforms=Windows;StrideSolution=$(StrideSolution)"/>
<MSBuild Projects="..\sources\launcher\Stride.Launcher\Stride.Launcher.csproj" Targets="Publish" Properties="$(BuildProperties);PublishProfile=FolderProfile;SolutionName=Stride.Launcher" />
</Target>

<Target Name="DownloadSignClient" Condition="'$(StrideSign)' == 'true'">
<Exec Command="dotnet tool install SignClient --tool-path sign" Condition="!Exists('sign\SignClient.exe')" />
</Target>

<Target Name="SignCredentialsCheck" Condition="'$(StrideSign)' == 'true'">
<Error Condition="'$(StrideSignUser)' == ''" Text="StrideSignUser is not set. Please set StrideSign to false if you don't want to sign using code certificates." />
<Error Condition="'$(StrideSignSecret)' == ''" Text="StrideSignSecret is not set. Please set StrideSign to false if you don't want to sign using code certificates." />
</Target>

<Target Name="SignPackage" DependsOnTargets="DownloadSignClient;SignCredentialsCheck" Condition="'$(StrideSign)' == 'true'">
<Target Name="SignPackage" DependsOnTargets="SignCredentialsCheck" Condition="'$(StrideSign)' == 'true'">
<!-- nupkg containing executables to sign -->
<Message Importance="high" Text="Signing packages"/>
<Exec Command='sign\SignClient sign -c "sign\appsettings.json" --input "..\bin\packages\*.nupkg" --name "Stride" --user "$(StrideSignUser)" --secret "$(StrideSignSecret.Replace("%", "%%"))" -f "sign\nupkgfilter.txt"' EchoOff="true" />
Expand Down
2 changes: 0 additions & 2 deletions build/sign/.gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +0,0 @@
/.store/
/SignClient.exe
183 changes: 183 additions & 0 deletions build/sign/.store/signclient/1.3.155/project.assets.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,183 @@
{
"version": 3,
"targets": {
"net7.0": {
"SignClient/1.3.155": {
"type": "package"
}
},
"net7.0/any": {
"SignClient/1.3.155": {
"type": "package",
"tools": {
"tools/net5.0/any/DotnetToolSettings.xml": {},
"tools/net5.0/any/Microsoft.Extensions.CommandLineUtils.dll": {},
"tools/net5.0/any/Microsoft.Extensions.Configuration.Abstractions.dll": {},
"tools/net5.0/any/Microsoft.Extensions.Configuration.EnvironmentVariables.dll": {},
"tools/net5.0/any/Microsoft.Extensions.Configuration.FileExtensions.dll": {},
"tools/net5.0/any/Microsoft.Extensions.Configuration.Json.dll": {},
"tools/net5.0/any/Microsoft.Extensions.Configuration.dll": {},
"tools/net5.0/any/Microsoft.Extensions.FileProviders.Abstractions.dll": {},
"tools/net5.0/any/Microsoft.Extensions.FileProviders.Physical.dll": {},
"tools/net5.0/any/Microsoft.Extensions.FileSystemGlobbing.dll": {},
"tools/net5.0/any/Microsoft.Extensions.Primitives.dll": {},
"tools/net5.0/any/Microsoft.Identity.Client.dll": {},
"tools/net5.0/any/Refit.dll": {},
"tools/net5.0/any/SignClient.deps.json": {},
"tools/net5.0/any/SignClient.dll": {},
"tools/net5.0/any/SignClient.pdb": {},
"tools/net5.0/any/SignClient.runtimeconfig.json": {}
}
}
}
},
"libraries": {
"SignClient/1.3.155": {
"sha512": "DEkr0B/UOiZl6R+YDOu/EXXoz6hi/KR5qWuHI/KzFL236aEwjXS177woxLzWLuGK99b5qZUS8Eyl6/qmJVqMvQ==",
"type": "package",
"path": "signclient/1.3.155",
"hasTools": true,
"files": [
".nupkg.metadata",
".signature.p7s",
"signclient.1.3.155.nupkg.sha512",
"signclient.nuspec",
"tools/net5.0/any/DotnetToolSettings.xml",
"tools/net5.0/any/Microsoft.Extensions.CommandLineUtils.dll",
"tools/net5.0/any/Microsoft.Extensions.Configuration.Abstractions.dll",
"tools/net5.0/any/Microsoft.Extensions.Configuration.EnvironmentVariables.dll",
"tools/net5.0/any/Microsoft.Extensions.Configuration.FileExtensions.dll",
"tools/net5.0/any/Microsoft.Extensions.Configuration.Json.dll",
"tools/net5.0/any/Microsoft.Extensions.Configuration.dll",
"tools/net5.0/any/Microsoft.Extensions.FileProviders.Abstractions.dll",
"tools/net5.0/any/Microsoft.Extensions.FileProviders.Physical.dll",
"tools/net5.0/any/Microsoft.Extensions.FileSystemGlobbing.dll",
"tools/net5.0/any/Microsoft.Extensions.Primitives.dll",
"tools/net5.0/any/Microsoft.Identity.Client.dll",
"tools/net5.0/any/Refit.dll",
"tools/net5.0/any/SignClient.deps.json",
"tools/net5.0/any/SignClient.dll",
"tools/net5.0/any/SignClient.pdb",
"tools/net5.0/any/SignClient.runtimeconfig.json",
"tools/netcoreapp2.1/any/DotnetToolSettings.xml",
"tools/netcoreapp2.1/any/Microsoft.Bcl.AsyncInterfaces.dll",
"tools/netcoreapp2.1/any/Microsoft.Extensions.CommandLineUtils.dll",
"tools/netcoreapp2.1/any/Microsoft.Extensions.Configuration.Abstractions.dll",
"tools/netcoreapp2.1/any/Microsoft.Extensions.Configuration.EnvironmentVariables.dll",
"tools/netcoreapp2.1/any/Microsoft.Extensions.Configuration.FileExtensions.dll",
"tools/netcoreapp2.1/any/Microsoft.Extensions.Configuration.Json.dll",
"tools/netcoreapp2.1/any/Microsoft.Extensions.Configuration.dll",
"tools/netcoreapp2.1/any/Microsoft.Extensions.FileProviders.Abstractions.dll",
"tools/netcoreapp2.1/any/Microsoft.Extensions.FileProviders.Physical.dll",
"tools/netcoreapp2.1/any/Microsoft.Extensions.FileSystemGlobbing.dll",
"tools/netcoreapp2.1/any/Microsoft.Extensions.Primitives.dll",
"tools/netcoreapp2.1/any/Microsoft.Identity.Client.dll",
"tools/netcoreapp2.1/any/Refit.dll",
"tools/netcoreapp2.1/any/SignClient.deps.json",
"tools/netcoreapp2.1/any/SignClient.dll",
"tools/netcoreapp2.1/any/SignClient.pdb",
"tools/netcoreapp2.1/any/SignClient.runtimeconfig.json",
"tools/netcoreapp2.1/any/System.Net.Http.Json.dll",
"tools/netcoreapp2.1/any/System.Runtime.CompilerServices.Unsafe.dll",
"tools/netcoreapp2.1/any/System.Text.Encodings.Web.dll",
"tools/netcoreapp2.1/any/System.Text.Json.dll",
"tools/netcoreapp3.1/any/DotnetToolSettings.xml",
"tools/netcoreapp3.1/any/Microsoft.Extensions.CommandLineUtils.dll",
"tools/netcoreapp3.1/any/Microsoft.Extensions.Configuration.Abstractions.dll",
"tools/netcoreapp3.1/any/Microsoft.Extensions.Configuration.EnvironmentVariables.dll",
"tools/netcoreapp3.1/any/Microsoft.Extensions.Configuration.FileExtensions.dll",
"tools/netcoreapp3.1/any/Microsoft.Extensions.Configuration.Json.dll",
"tools/netcoreapp3.1/any/Microsoft.Extensions.Configuration.dll",
"tools/netcoreapp3.1/any/Microsoft.Extensions.FileProviders.Abstractions.dll",
"tools/netcoreapp3.1/any/Microsoft.Extensions.FileProviders.Physical.dll",
"tools/netcoreapp3.1/any/Microsoft.Extensions.FileSystemGlobbing.dll",
"tools/netcoreapp3.1/any/Microsoft.Extensions.Primitives.dll",
"tools/netcoreapp3.1/any/Microsoft.Identity.Client.dll",
"tools/netcoreapp3.1/any/Refit.dll",
"tools/netcoreapp3.1/any/SignClient.deps.json",
"tools/netcoreapp3.1/any/SignClient.dll",
"tools/netcoreapp3.1/any/SignClient.pdb",
"tools/netcoreapp3.1/any/SignClient.runtimeconfig.json",
"tools/netcoreapp3.1/any/System.Net.Http.Json.dll",
"tools/netcoreapp3.1/any/System.Text.Json.dll"
]
}
},
"projectFileDependencyGroups": {
"net7.0": [
"signclient >= *"
]
},
"packageFolders": {
"C:\\dev\\stride\\build\\sign\\.store\\.stage\\5zdy4aug.kc2": {}
},
"project": {
"version": "1.0.0",
"restore": {
"projectUniqueName": "C:\\Users\\xen\\AppData\\Local\\Temp\\a51201f1-789d-4773-8ad7-bc52ff4d6172\\restore.csproj",
"projectName": "restore",
"projectPath": "C:\\Users\\xen\\AppData\\Local\\Temp\\a51201f1-789d-4773-8ad7-bc52ff4d6172\\restore.csproj",
"packagesPath": "C:\\dev\\stride\\build\\sign\\.store\\.stage\\5zdy4aug.kc2",
"outputPath": "C:\\dev\\stride\\build\\sign\\.store\\.stage\\5zdy4aug.kc2\\",
"projectStyle": "DotnetToolReference",
"configFilePaths": [
"C:\\dev\\stride\\NuGet.Config",
"C:\\Users\\xen\\AppData\\Roaming\\NuGet\\NuGet.Config",
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config",
"C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config"
],
"originalTargetFrameworks": [
"net7.0"
],
"sources": {
"C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
"C:\\Program Files\\dotnet\\library-packs": {},
"C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder": {},
"C:\\Users\\xen\\AppData\\Local\\Stride\\NugetDev": {},
"https://api.nuget.org/v3/index.json": {},
"https://packages.stride3d.net/nuget": {},
"https://pkgs.dev.azure.com/clairernovotny/GitBuilds/_packaging/MSBuildSdkExtras@Local/nuget/v3/index.json": {}
},
"frameworks": {
"net7.0": {
"targetAlias": "net7.0",
"projectReferences": {}
}
},
"warningProperties": {
"warnAsError": [
"NU1605"
]
}
},
"frameworks": {
"net7.0": {
"targetAlias": "net7.0",
"dependencies": {
"signclient": {
"target": "Package",
"version": "[*, )"
}
},
"imports": [
"net461",
"net462",
"net47",
"net471",
"net472",
"net48",
"net481"
],
"assetTargetFallback": true,
"warn": true,
"runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.102\\RuntimeIdentifierGraph.json"
}
},
"runtimes": {
"any": {
"#import": []
}
}
}
}
18 changes: 18 additions & 0 deletions build/sign/.store/signclient/1.3.155/restore.csproj.nuget.g.props
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
<?xml version="1.0" encoding="utf-8" standalone="no"?>
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
<RestoreSuccess Condition=" '$(RestoreSuccess)' == '' ">True</RestoreSuccess>
<RestoreTool Condition=" '$(RestoreTool)' == '' ">NuGet</RestoreTool>
<ProjectAssetsFile Condition=" '$(ProjectAssetsFile)' == '' ">$(MSBuildThisFileDirectory)project.assets.json</ProjectAssetsFile>
<NuGetPackageRoot Condition=" '$(NuGetPackageRoot)' == '' ">C:\dev\stride\build\sign\.store\.stage\5zdy4aug.kc2</NuGetPackageRoot>
<NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">C:\dev\stride\build\sign\.store\.stage\5zdy4aug.kc2</NuGetPackageFolders>
<NuGetProjectStyle Condition=" '$(NuGetProjectStyle)' == '' ">DotnetToolReference</NuGetProjectStyle>
<NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">6.4.0</NuGetToolVersion>
</PropertyGroup>
<ItemGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
<SourceRoot Include="C:\dev\stride\build\sign\.store\.stage\5zdy4aug.kc2\" />
</ItemGroup>
<PropertyGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
<PkgSignClient Condition=" '$(PkgSignClient)' == '' ">C:\dev\stride\build\sign\.store\.stage\5zdy4aug.kc2\signclient\1.3.155</PkgSignClient>
</PropertyGroup>
</Project>
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"version": 2,
"contentHash": "DEkr0B/UOiZl6R+YDOu/EXXoz6hi/KR5qWuHI/KzFL236aEwjXS177woxLzWLuGK99b5qZUS8Eyl6/qmJVqMvQ==",
"source": "https://api.nuget.org/v3/index.json"
}
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
WDWfUQBvT+3EbLeR27GgybCnPp129w9SuLxm6Nf3TyfI5yBpXctVp14D88xv6zl0V0P6ULtkmOqDv9hnKN504g==
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
<metadata>
<id>SignClient</id>
<version>1.3.155</version>
<authors>SignClient</authors>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<license type="expression">MIT</license>
<licenseUrl>https://licenses.nuget.org/MIT</licenseUrl>
<projectUrl>https://github.com/dotnet/SignService</projectUrl>
<description>Client-side tools for the .NET Foundation Sign Service</description>
<copyright>© 2006-2021 .NET Foundation and Contributors</copyright>
<packageTypes>
<packageType name="DotnetTool" />
</packageTypes>
<repository type="git" url="https://github.com/dotnet/SignService" commit="fa49e5e47663e4a07e917927a648a7c4b4fc3cb4" />
</metadata>
</package>
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<DotNetCliTool Version="1">
<Commands>
<Command Name="SignClient" EntryPoint="SignClient.dll" Runner="dotnet" />
</Commands>
</DotNetCliTool>
Git LFS file not shown
Git LFS file not shown
Git LFS file not shown
Git LFS file not shown
Git LFS file not shown
Git LFS file not shown
Git LFS file not shown
Git LFS file not shown
Git LFS file not shown
Git LFS file not shown
Git LFS file not shown
Git LFS file not shown
Loading

0 comments on commit c6431b8

Please sign in to comment.