Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
106 changes: 25 additions & 81 deletions Src/GHActionsCI/App.config
Original file line number Diff line number Diff line change
Expand Up @@ -6,119 +6,63 @@
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity
name="System.Runtime.CompilerServices.Unsafe"
publicKeyToken="b03f5f7f11d50a3a"
culture="neutral"
/>
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-6.0.3.0" newVersion="6.0.3.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity
name="System.Text.Json"
publicKeyToken="cc7b13ffcd2ddd51"
culture="neutral"
/>
<bindingRedirect oldVersion="0.0.0.0-8.0.0.5" newVersion="8.0.0.5" />
<assemblyIdentity name="System.Text.Json" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-10.0.0.9" newVersion="10.0.0.9" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="CrispyWaffle" publicKeyToken="null" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-8.2.97.0" newVersion="8.2.97.0" />
<bindingRedirect oldVersion="0.0.0.0-10.2.9.0" newVersion="10.2.9.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity
name="Microsoft.Bcl.AsyncInterfaces"
publicKeyToken="cc7b13ffcd2ddd51"
culture="neutral"
/>
<bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0" />
<assemblyIdentity name="Microsoft.Bcl.AsyncInterfaces" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-10.0.0.9" newVersion="10.0.0.9" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity
name="Newtonsoft.Json"
publicKeyToken="30ad4fe6b2a6aeed"
culture="neutral"
/>
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-13.0.0.0" newVersion="13.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity
name="System.Buffers"
publicKeyToken="cc7b13ffcd2ddd51"
culture="neutral"
/>
<bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
<assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.5.0" newVersion="4.0.5.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity
name="System.Diagnostics.EventLog"
publicKeyToken="cc7b13ffcd2ddd51"
culture="neutral"
/>
<bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0" />
<assemblyIdentity name="System.Diagnostics.EventLog" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-10.0.0.9" newVersion="10.0.0.9" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity
name="System.Memory"
publicKeyToken="cc7b13ffcd2ddd51"
culture="neutral"
/>
<bindingRedirect oldVersion="0.0.0.0-4.0.1.2" newVersion="4.0.1.2" />
<assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.5.0" newVersion="4.0.5.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity
name="System.Numerics.Vectors"
publicKeyToken="b03f5f7f11d50a3a"
culture="neutral"
/>
<bindingRedirect oldVersion="0.0.0.0-4.1.4.0" newVersion="4.1.4.0" />
<assemblyIdentity name="System.Numerics.Vectors" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.1.6.0" newVersion="4.1.6.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity
name="System.Security.AccessControl"
publicKeyToken="b03f5f7f11d50a3a"
culture="neutral"
/>
<assemblyIdentity name="System.Security.AccessControl" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-6.0.0.1" newVersion="6.0.0.1" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity
name="System.Security.Permissions"
publicKeyToken="cc7b13ffcd2ddd51"
culture="neutral"
/>
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
<assemblyIdentity name="System.Security.Permissions" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-10.0.0.9" newVersion="10.0.0.9" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity
name="System.Security.Principal.Windows"
publicKeyToken="b03f5f7f11d50a3a"
culture="neutral"
/>
<assemblyIdentity name="System.Security.Principal.Windows" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-5.0.0.0" newVersion="5.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity
name="System.Text.Encodings.Web"
publicKeyToken="cc7b13ffcd2ddd51"
culture="neutral"
/>
<bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0" />
<assemblyIdentity name="System.Text.Encodings.Web" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-10.0.0.9" newVersion="10.0.0.9" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity
name="System.Threading.Tasks.Extensions"
publicKeyToken="cc7b13ffcd2ddd51"
culture="neutral"
/>
<bindingRedirect oldVersion="0.0.0.0-4.2.0.1" newVersion="4.2.0.1" />
<assemblyIdentity name="System.Threading.Tasks.Extensions" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.2.4.0" newVersion="4.2.4.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity
name="System.ValueTuple"
publicKeyToken="cc7b13ffcd2ddd51"
culture="neutral"
/>
<assemblyIdentity name="System.ValueTuple" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
</dependentAssembly>
</assemblyBinding>
Expand Down
44 changes: 12 additions & 32 deletions Src/GHActionsCI/GHActionsCI.csproj
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import
Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props"
Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')"
/>
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
Expand All @@ -16,7 +13,8 @@
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<Deterministic>true</Deterministic>
<TargetFrameworkProfile />
<NuGetPackageImportStamp></NuGetPackageImportStamp>
<NuGetPackageImportStamp>
</NuGetPackageImportStamp>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
<PlatformTarget>AnyCPU</PlatformTarget>
Expand All @@ -38,8 +36,8 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="CrispyWaffle, Version=10.2.6.0, Culture=neutral, PublicKeyToken=null">
<HintPath>..\..\packages\CrispyWaffle.10.2.6\lib\netstandard2.0\CrispyWaffle.dll</HintPath>
<Reference Include="CrispyWaffle, Version=10.2.9.0, Culture=neutral, PublicKeyToken=null">
<HintPath>..\..\packages\CrispyWaffle.10.2.9\lib\netstandard2.0\CrispyWaffle.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=10.0.0.9, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51">
Expand Down Expand Up @@ -121,33 +119,15 @@
<None Include="Properties\Version.txt" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import
Project="..\..\packages\MSBuildTasks.1.5.0.235\build\MSBuildTasks.targets"
Condition="Exists('..\..\packages\MSBuildTasks.1.5.0.235\build\MSBuildTasks.targets')"
/>
<Import Project="..\..\packages\MSBuildTasks.1.5.0.235\build\MSBuildTasks.targets" Condition="Exists('..\..\packages\MSBuildTasks.1.5.0.235\build\MSBuildTasks.targets')" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
</PropertyGroup>
<Error
Condition="!Exists('..\..\packages\MSBuildTasks.1.5.0.235\build\MSBuildTasks.targets')"
Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\MSBuildTasks.1.5.0.235\build\MSBuildTasks.targets'))"
/>
<Error
Condition="!Exists('..\..\packages\MSBuild.Version.Target.4.0.153\build\MSBuild.Version.Target.targets')"
Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\MSBuild.Version.Target.4.0.153\build\MSBuild.Version.Target.targets'))"
/>
<Error
Condition="!Exists('..\..\packages\System.ValueTuple.4.6.2\build\net471\System.ValueTuple.targets')"
Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\System.ValueTuple.4.6.2\build\net471\System.ValueTuple.targets'))"
/>
<Error Condition="!Exists('..\..\packages\MSBuildTasks.1.5.0.235\build\MSBuildTasks.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\MSBuildTasks.1.5.0.235\build\MSBuildTasks.targets'))" />
<Error Condition="!Exists('..\..\packages\MSBuild.Version.Target.4.0.153\build\MSBuild.Version.Target.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\MSBuild.Version.Target.4.0.153\build\MSBuild.Version.Target.targets'))" />
<Error Condition="!Exists('..\..\packages\System.ValueTuple.4.6.2\build\net471\System.ValueTuple.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\System.ValueTuple.4.6.2\build\net471\System.ValueTuple.targets'))" />
</Target>
<Import
Project="..\..\packages\MSBuild.Version.Target.4.0.153\build\MSBuild.Version.Target.targets"
Condition="Exists('..\..\packages\MSBuild.Version.Target.4.0.153\build\MSBuild.Version.Target.targets')"
/>
<Import
Project="..\..\packages\System.ValueTuple.4.6.2\build\net471\System.ValueTuple.targets"
Condition="Exists('..\..\packages\System.ValueTuple.4.6.2\build\net471\System.ValueTuple.targets')"
/>
</Project>
<Import Project="..\..\packages\MSBuild.Version.Target.4.0.153\build\MSBuild.Version.Target.targets" Condition="Exists('..\..\packages\MSBuild.Version.Target.4.0.153\build\MSBuild.Version.Target.targets')" />
<Import Project="..\..\packages\System.ValueTuple.4.6.2\build\net471\System.ValueTuple.targets" Condition="Exists('..\..\packages\System.ValueTuple.4.6.2\build\net471\System.ValueTuple.targets')" />
</Project>
4 changes: 2 additions & 2 deletions Src/GHActionsCI/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -44,5 +44,5 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.1074.1")]
[assembly: AssemblyFileVersion("1.0.1074.1")]
[assembly: AssemblyVersion("1.0.1075.1")]
[assembly: AssemblyFileVersion("1.0.1075.1")]
2 changes: 1 addition & 1 deletion Src/GHActionsCI/Properties/Version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.0.1074.1
1.0.1075.1
18 changes: 4 additions & 14 deletions Src/GHActionsCI/packages.config
Original file line number Diff line number Diff line change
@@ -1,19 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="CrispyWaffle" version="10.2.6" targetFramework="net48" />
<package id="CrispyWaffle" version="10.2.9" targetFramework="net48" />
<package id="Microsoft.Bcl.AsyncInterfaces" version="10.0.9" targetFramework="net48" />
<package
id="MSBuild.Version.Target"
version="4.0.153"
targetFramework="net48"
developmentDependency="true"
/>
<package
id="MSBuildTasks"
version="1.5.0.235"
targetFramework="net48"
developmentDependency="true"
/>
<package id="MSBuild.Version.Target" version="4.0.153" targetFramework="net48" developmentDependency="true" />
<package id="MSBuildTasks" version="1.5.0.235" targetFramework="net48" developmentDependency="true" />
<package id="Newtonsoft.Json" version="13.0.4" targetFramework="net48" />
<package id="System.Buffers" version="4.6.1" targetFramework="net48" />
<package id="System.Diagnostics.EventLog" version="10.0.9" targetFramework="net48" />
Expand All @@ -28,4 +18,4 @@
<package id="System.Text.Json" version="10.0.9" targetFramework="net48" />
<package id="System.Threading.Tasks.Extensions" version="4.6.3" targetFramework="net48" />
<package id="System.ValueTuple" version="4.6.2" targetFramework="net48" />
</packages>
</packages>
Loading