Skip to content

Commit

Permalink
Fixed how DapperExtensions.StrongName is linked to allow for builds i…
Browse files Browse the repository at this point in the history
…n net472 and net5.0

Updated Cosmos.iss to copy subdirectories for IL2CPU
  • Loading branch information
quajak committed May 23, 2021
1 parent ec5980b commit 4dfeb8e
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 2 deletions.
11 changes: 11 additions & 0 deletions Build.sln
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VSPropertyPages", "..\Commo
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cosmos.Debug.HyperVServer", "source\Cosmos.Debug.HyperVServer\Cosmos.Debug.HyperVServer.csproj", "{9413B5A0-1120-43AD-8784-8A3726C1898C}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DapperExtensions.StrongName", "Resources\Dependencies\DapperExtensions.StrongName\DapperExtensions.StrongName.csproj", "{28F18214-DFF8-4A30-BA24-4F32C20CA910}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -353,6 +355,14 @@ Global
{9413B5A0-1120-43AD-8784-8A3726C1898C}.Release|Any CPU.Build.0 = Release|Any CPU
{9413B5A0-1120-43AD-8784-8A3726C1898C}.Release-CI|Any CPU.ActiveCfg = Release|Any CPU
{9413B5A0-1120-43AD-8784-8A3726C1898C}.Release-CI|Any CPU.Build.0 = Release|Any CPU
{28F18214-DFF8-4A30-BA24-4F32C20CA910}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{28F18214-DFF8-4A30-BA24-4F32C20CA910}.Debug|Any CPU.Build.0 = Debug|Any CPU
{28F18214-DFF8-4A30-BA24-4F32C20CA910}.Debug-CI|Any CPU.ActiveCfg = Debug|Any CPU
{28F18214-DFF8-4A30-BA24-4F32C20CA910}.Debug-CI|Any CPU.Build.0 = Debug|Any CPU
{28F18214-DFF8-4A30-BA24-4F32C20CA910}.Release|Any CPU.ActiveCfg = Release|Any CPU
{28F18214-DFF8-4A30-BA24-4F32C20CA910}.Release|Any CPU.Build.0 = Release|Any CPU
{28F18214-DFF8-4A30-BA24-4F32C20CA910}.Release-CI|Any CPU.ActiveCfg = Release|Any CPU
{28F18214-DFF8-4A30-BA24-4F32C20CA910}.Release-CI|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down Expand Up @@ -395,6 +405,7 @@ Global
{0BA0EC69-F124-44C1-823D-C97FE3AEC59E} = {D95021E1-A2C9-4829-819E-ED433AF13162}
{3487890D-43F4-4810-9587-1F02F646915D} = {CD3F5E45-8B24-424F-ADF1-0211712F4CB7}
{9413B5A0-1120-43AD-8784-8A3726C1898C} = {FF5BAFDE-AE9D-438D-935A-86B33EE0A758}
{28F18214-DFF8-4A30-BA24-4F32C20CA910} = {FF5BAFDE-AE9D-438D-935A-86B33EE0A758}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {E5429BF0-2CEE-45B0-BC73-2188A409E1D3}
Expand Down
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<PropertyGroup>
<Description>DapperExtensions.StrongName</Description>
<Authors>Rafael.Carvalho</Authors>
<TargetFramework>net5.0</TargetFramework>
<TargetFrameworks>net5.0;net472</TargetFrameworks>
<PackageId>DapperExtensions.StrongName</PackageId>
<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
<Version>1.50.2</Version>
Expand Down
2 changes: 1 addition & 1 deletion Setup/Cosmos.iss
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ Source: ".\Build\Tools\*.exe"; DestDir: "{app}\Build\Tools"; Flags: ignoreversio
Source: ".\Build\Tools\NAsm\*.exe"; DestDir: "{app}\Build\Tools\NAsm"; Flags: ignoreversion uninsremovereadonly
Source: ".\Build\Tools\Cygwin\*"; DestDir: "{app}\Build\Tools\cygwin"; Flags: ignoreversion uninsremovereadonly overwritereadonly
Source: ".\Build\Tools\mkisofs\*"; DestDir: "{app}\Build\Tools\mkisofs"; Flags: ignoreversion uninsremovereadonly overwritereadonly
Source: ".\Build\VSIP\IL2CPU\*"; DestDir: "{app}\Build\IL2CPU"; Flags: ignoreversion uninsremovereadonly
Source: ".\Build\VSIP\IL2CPU\*"; DestDir: "{app}\Build\IL2CPU"; Flags: ignoreversion uninsremovereadonly recursesubdirs
;Source: ".\Build\VSIP\XSharp\*"; DestDir: "{app}\Build\XSharp"; Flags: ignoreversion uninsremovereadonly
Source: ".\Build\VSIP\Cosmos.Deploy.USB.exe"; DestDir: "{app}\Build\Tools"; Flags: ignoreversion uninsremovereadonly
Source: ".\Build\VSIP\Cosmos.Deploy.Pixie.exe"; DestDir: "{app}\Build\Tools"; Flags: ignoreversion uninsremovereadonly
Expand Down

0 comments on commit 4dfeb8e

Please sign in to comment.