Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Publish node task runner #283

Merged
merged 4 commits into from
Jul 12, 2023
Merged

Publish node task runner #283

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
85c2038
Publish node task runner
BMurri Jul 11, 2023
70f46d9
remove changes to solution file
BMurri Jul 11, 2023
3b7f7f0
Remove fragile publishing from tesapi.web project
BMurri Jul 11, 2023
3bc84e9
Remove commented out code
BMurri Jul 12, 2023
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
118 changes: 118 additions & 0 deletions src/PublishTesRunnerToTesApiArtifacts/PublishTesRunnerToTesApiArtifacts.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,118 @@
<Project>
<Import Sdk="Microsoft.NET.Sdk" Project="Sdk.props"/>

<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<RuntimeIdentifiers>linux-x64</RuntimeIdentifiers>
</PropertyGroup>

<PropertyGroup Condition=" '$(ArtifactStagingDirectory)' != '' ">
<TesApiWebArchive>$(ArtifactStagingDirectory)\TesApi.Web</TesApiWebArchive>
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\Tes.RunnerCLI\Tes.RunnerCLI.csproj"
Targets="Publish;PublishItemsOutputGroup"
AdditionalProperties="PublishProfile=FolderProfile">
<ReferenceOutputAssembly>False</ReferenceOutputAssembly>
<OutputItemType>None</OutputItemType>
<CopyToOutputDirectory>Never</CopyToOutputDirectory>
<Private>False</Private>
</ProjectReference>
<ProjectReference Condition=" '$(TesApiWebArchive)' == '' "
Include="..\TesApi.Web\TesApi.Web.csproj"
Targets="Publish;PublishItemsOutputGroup"
AdditionalProperties="RuntimeIdentifiers=$(RuntimeIdentifiers)">
<ReferenceOutputAssembly>False</ReferenceOutputAssembly>
<OutputItemType>None</OutputItemType>
<CopyToOutputDirectory>Never</CopyToOutputDirectory>
<Private>False</Private>
</ProjectReference>
<None Condition=" '$(TesApiWebArchive)' != '' "
Include="$(TesApiWebArchive)\tesapi.dll"
MsBuildSourceProjectFile="$(TesApiWebArchive)\proj"
OutputPath="tesapi.dll"
TargetPath="tesapi.dll" />
</ItemGroup>

<Import Sdk="Microsoft.NET.Sdk" Project="Sdk.targets"/>

<UsingTask TaskName="ConvertNoneToPublishDir" TaskFactory="RoslynCodeTaskFactory" AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.Core.dll">
<ParameterGroup>
<PublishedFiles ParameterType="Microsoft.Build.Framework.ITaskItem[]" Required="true" />
<PublishedDirectories ParameterType="Microsoft.Build.Framework.ITaskItem[]" Output="true" />
</ParameterGroup>
<Task>
<!--<Reference Include="System.Linq"/>-->
<Using Namespace="System.Linq" />
<Using Namespace="System.IO" />
<Using Namespace="Microsoft.Build.Framework" />
<Using Namespace="Microsoft.Build.Utilities" />
<Code Type="Fragment" Language="cs">
<![CDATA[
var dirs = new List<ITaskItem>();
foreach (var file in PublishedFiles)
{
Log.LogMessage(MessageImportance.Normal, "Parsing {0}", file.ItemSpec);
var dirInfo = Directory.GetParent(Path.Combine(Directory.GetParent(file.GetMetadata("MsBuildSourceProjectFile")).FullName, file.GetMetadata("OutputPath")));
var dir = new TaskItem(dirInfo.FullName);
file.CopyMetadataTo(dir);
dirs.Add(dir);
}
PublishedDirectories = dirs.ToArray();
]]>
</Code>
</Task>
</UsingTask>

<UsingTask TaskName="GenerateMD5" TaskFactory="RoslynCodeTaskFactory" AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.Core.dll">
<ParameterGroup>
<InputFile ParameterType="Microsoft.Build.Framework.ITaskItem" Required="true" />
<MD5Hash Output="true" />
</ParameterGroup>
<Task>
<Using Namespace="System" />
<Using Namespace="System.IO" />
<Using Namespace="System.Security.Cryptography" />
<Using Namespace="Microsoft.Build.Framework" />
<Code Type="Fragment" Language="cs">
<![CDATA[
Log.LogMessage(MessageImportance.Normal, "Computing MD5 hash for {0}", InputFile.ItemSpec);
var md5spc = MD5.Create();
MD5Hash = Convert.ToBase64String(md5spc.ComputeHash(File.ReadAllBytes(InputFile.ItemSpec)));
Log.LogMessage(MessageImportance.Normal, "Computed MD5 hash is {0}", MD5Hash);
]]>
</Code>
</Task>

</UsingTask>

<Target Name="Compile">
<ConvertNoneToPublishDir PublishedFiles="@(None)">
<Output ItemName="__PublishDirs" TaskParameter="PublishedDirectories"/>
</ConvertNoneToPublishDir>
<ItemGroup>
<IntermediateAssembly Remove="@(IntermediateAssembly)" />
<__tRunnerPath Include="@(__PublishDirs)" Condition="Exists('%(__PublishDirs.Identity)/tRunner') and '%(__PublishDirs.TargetPath)' == 'tRunner'" />
<__tRunnerFiles Include="%(__tRunnerPath.FullPath)\**\*" />
<__tesapiScriptsPath Include="@(__PublishDirs->'%(FullPath)\scripts')" Condition="Exists('%(__PublishDirs.Identity)/tesapi.dll') and '%(__PublishDirs.TargetPath)' == 'tesapi.dll'" />
</ItemGroup>
<Copy SourceFiles="@(__tRunnerFiles)"
DestinationFolder="@(__tesapiScriptsPath)"
SkipUnchangedFiles="false"
Condition=" '%(__tRunnerFiles.Filename)%(__tRunnerFiles.Extension)' == 'tRunner' "/>
<GenerateMD5 InputFile="@(__tesapiScriptsPath->'%(FullPath)\tRunner')">
<Output TaskParameter="MD5Hash" PropertyName="__TRunnerMD5Hash" />
</GenerateMD5>
<WriteLinesToFile Lines="$(__TRunnerMD5Hash)" File="@(__tesapiScriptsPath->'%(FullPath)\TRunnerMD5Hash.txt')" WriteOnlyWhenDifferent="true" Overwrite="true" />
<ItemGroup>
<FileWrites Include="@(__tesapiScriptsPath->'%(FullPath)\TRunnerMD5Hash.txt')" />
<FileWrites Include="@(__tesapiScriptsPath->'%(FullPath)\tRunner')" />
</ItemGroup>
</Target>

<Target Name="CopyFilesToOutputDirectory" />

</Project>
80 changes: 1 addition & 79 deletions src/TesApi.Web/TesApi.Web.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,16 +62,6 @@

<ItemGroup>
<ProjectReference Include="..\CommonUtilities\CommonUtilities.csproj" />

<ProjectReference Include="..\Tes.RunnerCLI\Tes.RunnerCLI.csproj"
Targets="Publish"
AdditionalProperties="PublishProfile=FolderProfile">
<ReferenceOutputAssembly>False</ReferenceOutputAssembly>
<OutputItemType>None</OutputItemType>
<CopyToOutputDirectory>Never</CopyToOutputDirectory>
<Private>False</Private>
</ProjectReference>

<ProjectReference Include="..\Tes\Tes.csproj" />
</ItemGroup>

Expand All @@ -80,72 +70,4 @@
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
</ItemGroup>

<UsingTask TaskName="GenerateMD5" TaskFactory="RoslynCodeTaskFactory" AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.Core.dll">
<ParameterGroup>
<InputFile ParameterType="Microsoft.Build.Framework.ITaskItem" Required="true" />
<MD5Hash Output="true" />
</ParameterGroup>
<Task>
<!--<Reference Include="" />-->
<Using Namespace="System" />
<Using Namespace="System.IO" />
<Using Namespace="System.Security.Cryptography" />
<Using Namespace="Microsoft.Build.Framework" />
<Code Type="Fragment" Language="cs">
<![CDATA[
Log.LogMessage(MessageImportance.Normal, "Computing MD5 hash for {0}", InputFile.ItemSpec);
var md5spc = MD5.Create();
MD5Hash = Convert.ToBase64String(md5spc.ComputeHash(File.ReadAllBytes(InputFile.ItemSpec)));
Log.LogMessage(MessageImportance.Normal, "Computed MD5 hash is {0}", MD5Hash);
]]>
</Code>
</Task>
</UsingTask>

<Target Name="__AssignPublishProperties" BeforeTargets="ResolveProjectReferences" AfterTargets="PrepareProjectReferences">
<ConvertToAbsolutePath Paths="$(OutputPath)scripts\">
<Output TaskParameter="AbsolutePaths" PropertyName="__TesRunnerPublishDir"/>
</ConvertToAbsolutePath>

<ItemGroup>
<__ProjectNotReferenced Include="@(_MSBuildProjectReferenceExistent)" Condition=" '%(Filename)' == 'Tes.RunnerCLI' "/>
<_MSBuildProjectReferenceExistent Remove="@(__ProjectNotReferenced)"/>
<_MSBuildProjectReferenceExistent Include="@(__ProjectNotReferenced)">
<Properties>%(__ProjectNotReferenced.AdditionalProperties);PublishDir=$(__TesRunnerPublishDir);%(__ProjectNotReferenced.SetConfiguration);%(__ProjectNotReferenced.SetPlatform);%(__ProjectNotReferenced.SetTargetFramework)</Properties>
<AdditionalProperties></AdditionalProperties>
<GlobalPropertiesToRemove>%(__ProjectNotReferenced.GlobalPropertiesToRemove);PublishSingleFile;PublishTrimmed;SelfContained</GlobalPropertiesToRemove>
</_MSBuildProjectReferenceExistent>
</ItemGroup>
</Target>

<Target Name="__GetPublishedProjectMD5Hash" AfterTargets="ResolveProjectReferences;AssignTargetPaths;__AdjustCopyToOutputDirectoryItemsOptimization">
<ItemGroup>
<__TRunnerMD5Hash Include="$(IntermediateOutputPath)TRunnerMD5Hash.txt" />
</ItemGroup>

<GenerateMD5 InputFile="$(__TesRunnerPublishDir)tRunner">
<Output TaskParameter="MD5Hash" PropertyName="__TRunnerMD5Hash" />
</GenerateMD5>

<WriteLinesToFile Lines="$(__TRunnerMD5Hash)" File="@(__TRunnerMD5Hash)" WriteOnlyWhenDifferent="true" Overwrite="true" />

<ItemGroup>
<FileWrites Include="@(__TRunnerMD5Hash)" />
<ContentWithTargetPath Include="@(__TRunnerMD5Hash->'%(FullPath)')">
<TargetPath>scripts\TRunnerMD5Hash.txt</TargetPath>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</ContentWithTargetPath>
</ItemGroup>
</Target>

<Target Name="CopyNodeRunnerToPublishDir" BeforeTargets="ComputeResolvedFilesToPublishList">
<ItemGroup>
<ResolvedFileToPublish Include="$(__TesRunnerPublishDir)tRunner">
<RelativePath>scripts\tRunner</RelativePath>
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
</ResolvedFileToPublish>
</ItemGroup>
</Target>

</Project>
</Project>