Merge pull request #2 from karelmaxa/build-pipeline

Add build pipeline
WrenSecurity · Jan 18, 2025 · 6352f58 · 6352f58
2 parents 9a69b35 + 8e2ff59
commit 6352f58
Show file tree

Hide file tree

Showing 5 changed files with 115 additions and 61 deletions.
diff --git a/.github/workflows/buid.yml b/.github/workflows/buid.yml
@@ -0,0 +1,39 @@
+name: Build
+
+on: [push, pull_request]
+
+jobs:
+  build:
+    runs-on: windows-2019
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Install .NET Core
+        uses: actions/setup-dotnet@v4
+        with:
+          dotnet-version: 6.0.x
+
+      - name: Setup MSBuild
+        uses: microsoft/setup-msbuild@v2
+
+      - name: Setup NuGet
+        uses: nuget/setup-nuget@v2
+
+      - name: Install external dependencies
+        run: |
+          nuget install MSBuildTasks -Version 1.5.0.235
+          nuget install NUnit.Runners -Version 2.6.7
+
+      - name: Install project dependencies
+        run: nuget restore ConnectorFramework.sln
+
+      - name: Build project
+        run: msbuild ConnectorFramework.sln /p:Configuration=Release
+
+      - name: Upload built artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: wrenicf-dotnet-framework
+          path:  |
+            ServiceInstall\bin\Release\openicf-*.zip
+            ServiceInstall\bin\Release\openicf-*.msi
diff --git a/Framework.targets b/Framework.targets
@@ -1,27 +1,28 @@
 <!--
   ====================
   DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-  
-  Copyright 2008-2009 Sun Microsystems, Inc. All rights reserved.     
-  
-  The contents of this file are subject to the terms of the Common Development 
-  and Distribution License("CDDL") (the "License").  You may not use this file 
+
+  Copyright 2008-2009 Sun Microsystems, Inc. All rights reserved.
+
+  The contents of this file are subject to the terms of the Common Development
+  and Distribution License("CDDL") (the "License").  You may not use this file
   except in compliance with the License.
-  
-  You can obtain a copy of the License at 
+
+  You can obtain a copy of the License at
   http://opensource.org/licenses/cddl1.php
-  See the License for the specific language governing permissions and limitations 
-  under the License. 
-  
+  See the License for the specific language governing permissions and limitations
+  under the License.
+
   When distributing the Covered Code, include this CDDL Header Notice in each file
   and include the License file at http://opensource.org/licenses/cddl1.php.
-  If applicable, add the following below this CDDL Header, with the fields 
-  enclosed by brackets [] replaced by your own identifying information: 
+  If applicable, add the following below this CDDL Header, with the fields
+  enclosed by brackets [] replaced by your own identifying information:
   "Portions Copyrighted [year] [name of copyright owner]"
   ====================
+  Portions Copyrighted 2025 Wren Security.
 -->
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
-    <PropertyGroup>                
+    <PropertyGroup>
         <VersionFileIn>$(MSBuildProjectDirectory)\version.template</VersionFileIn>
         <VersionFileOut>$(MSBuildProjectDirectory)\version.txt</VersionFileOut>
         <Company>ForgeRock</Company>
@@ -30,9 +31,11 @@
         <!--FrameworkRootDir>$(MSBuildProjectDirectory)\..\..\</FrameworkRootDir-->
         <FrameworkRootDir>$(MSBuildProjectDirectory)</FrameworkRootDir>
         <TreatTestFailureAsBuildFailure>true</TreatTestFailureAsBuildFailure>
+        <MSBuildCommunityTasksPath>$(SolutionDir)\MSBuildTasks.1.5.0.235\tools</MSBuildCommunityTasksPath>
+        <NunitPath>$(SolutionDir)\NUnit.Runners.2.6.7\tools</NunitPath>
     </PropertyGroup>
 
-    <Import Project="$(MSBuildExtensionsPath)\MSBuildCommunityTasks\MSBuild.Community.Tasks.Targets" />  
+    <Import Project="$(MSBuildCommunityTasksPath)\MSBuild.Community.Tasks.Targets" />
 
     <Target Name="GenerateAssemblyInfo">
         <Version VersionFile="$(VersionFileIn)">
@@ -49,17 +52,17 @@
         </CreateProperty>
         <Message Text="$(MSBuildProjectName) Version: $(Major).$(Minor).$(Build).$(Revision) Revision: $(SVNRevision)"/>
         <WriteLinesToFile File="$(VersionFileOut)" Lines="$(Major).$(Minor).$(Build).$(Revision)" Overwrite="true" />
-        <AssemblyInfo CodeLanguage="CS"  
+        <AssemblyInfo CodeLanguage="CS"
             OutputFile="AssemblyInfo.cs"
             AssemblyTitle="$(ProductName)"
             AssemblyProduct="OpenICF"
             AssemblyCopyright="$(Copyright)"
-            AssemblyCompany="$(Company)"             
-            AssemblyVersion="$(Major).$(Minor).$(Build).$(Revision)" 
+            AssemblyCompany="$(Company)"
+            AssemblyVersion="$(Major).$(Minor).$(Build).$(Revision)"
             AssemblyFileVersion="$(Major).$(Minor).$(Build).$(Revision) Revision $(SVNRevision)"
             InternalsVisibleTo="$(InternalsVisibleTo)" />
     </Target>
-    
+
     <Target Name="CopyOutput">
         <MakeDir Directories="$(FrameworkDistDir)" Condition="!Exists('$(FrameworkDistDir)')" />
         <Copy
@@ -71,20 +74,20 @@
         <CreateItem Include="$(OutputPath)\*Tests.dll">
             <Output TaskParameter="Include" ItemName="TestAssembly" />
         </CreateItem>
-        <MSBuild.Community.Tasks.NUnit DisableShadowCopy="true" Assemblies="@(TestAssembly)" ExcludeCategory="LongRunning" ToolPath="$(NUNIT_HOME)\bin" OutputXmlFile="$(OutputPath)\NUnitResults_$(Configuration).xml" ShowLabels="True">
+        <MSBuild.Community.Tasks.NUnit DisableShadowCopy="true" Assemblies="@(TestAssembly)" ExcludeCategory="LongRunning" ToolPath="$(NunitPath)" OutputXmlFile="$(OutputPath)\NUnitResults_$(Configuration).xml" ShowLabels="True">
             <Output TaskParameter="ExitCode" PropertyName="NUnitResult" />
         </MSBuild.Community.Tasks.NUnit>
     </Target>
 
     <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-    
+
     <PropertyGroup>
         <BuildDependsOn>
             FrameworkBeforeBuild;
             $(BuildDependsOn);
             FrameworkAfterBuild
         </BuildDependsOn>
-        <CleanDependsOn>            
+        <CleanDependsOn>
             $(CleanDependsOn);
             FrameworkClean
         </CleanDependsOn>
@@ -95,11 +98,11 @@
     </Target>
 
     <Target Name="FrameworkAfterBuild">
-        <CallTarget Condition=" '$(CopyOutput)'=='true' " Targets="CopyOutput" />           
+        <CallTarget Condition=" '$(CopyOutput)'=='true' " Targets="CopyOutput" />
     </Target>
 
     <Target Name="FrameworkClean">
         <RemoveDir Directories="$(FrameworkDistDir)"/>
     </Target>
-    
+
 </Project>
diff --git a/FrameworkServerTests/FrameworkServerTests.csproj b/FrameworkServerTests/FrameworkServerTests.csproj
@@ -5,21 +5,22 @@
 
   Copyright (c) 2015 ForgeRock AS. All rights reserved.
 
-  The contents of this file are subject to the terms of the Common Development 
-  and Distribution License("CDDL") (the "License").  You may not use this file 
+  The contents of this file are subject to the terms of the Common Development
+  and Distribution License("CDDL") (the "License").  You may not use this file
   except in compliance with the License.
-  
-  You can obtain a copy of the License at 
+
+  You can obtain a copy of the License at
   http://opensource.org/licenses/CDDL-1.0
-  See the License for the specific language governing permissions and limitations 
-  under the License. 
-  
+  See the License for the specific language governing permissions and limitations
+  under the License.
+
   When distributing the Covered Code, include this CDDL Header Notice in each file
   and include the License file at legal/CDDLv1.txt.
-  If applicable, add the following below this CDDL Header, with the fields 
-  enclosed by brackets [] replaced by your own identifying information: 
+  If applicable, add the following below this CDDL Header, with the fields
+  enclosed by brackets [] replaced by your own identifying information:
   "Portions Copyrighted [year] [name of copyright owner]"
   ====================
+  Portions Copyrighted 2025 Wren Security.
 -->
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
@@ -36,6 +37,7 @@
     <ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <TestProjectType>UnitTest</TestProjectType>
     <TargetFrameworkProfile />
+    <NunitPath>$(SolutionDir)\NUnit.Runners.2.6.7\tools</NunitPath>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -58,7 +60,10 @@
     <Reference Include="Google.Protobuf">
       <HintPath>..\packages\Google.ProtocolBuffers.3\lib\Google.Protobuf.dll</HintPath>
     </Reference>
-    <Reference Include="nunit.framework" />
+    <Reference Include="nunit.framework">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>$(NunitPath)\nunit.framework.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.IdentityModel" />
     <Reference Include="System.Reactive.Core, Version=2.2.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
@@ -146,7 +151,7 @@
     <CreateItem Include="FrameworkServerTests.dll">
       <Output TaskParameter="Include" ItemName="TestAssembly" />
     </CreateItem>
-    <!--MSBuild.Community.Tasks.NUnit DisableShadowCopy="true" WorkingDirectory="bin\$(Configuration)" Assemblies="@(TestAssembly)" ContinueOnError="true" ToolPath="$(NUNIT_HOME)\bin" OutputXmlFile="TestResults_$(Configuration).xml" /-->
+    <!--MSBuild.Community.Tasks.NUnit DisableShadowCopy="true" WorkingDirectory="bin\$(Configuration)" Assemblies="@(TestAssembly)" ContinueOnError="true" ToolPath="$(NunitPath)" OutputXmlFile="TestResults_$(Configuration).xml" /-->
   </Target>
   <Target Name="Clean">
     <Delete Files="AssemblyInfo.cs;version.txt" />

diff --git a/FrameworkTests/FrameworkTests.csproj b/FrameworkTests/FrameworkTests.csproj
@@ -2,24 +2,25 @@
 <!--
   ====================
   DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-  
-  Copyright 2008-2009 Sun Microsystems, Inc. All rights reserved.     
-  
-  The contents of this file are subject to the terms of the Common Development 
-  and Distribution License("CDDL") (the "License").  You may not use this file 
+
+  Copyright 2008-2009 Sun Microsystems, Inc. All rights reserved.
+
+  The contents of this file are subject to the terms of the Common Development
+  and Distribution License("CDDL") (the "License").  You may not use this file
   except in compliance with the License.
-  
-  You can obtain a copy of the License at 
+
+  You can obtain a copy of the License at
   http://opensource.org/licenses/cddl1.php
-  See the License for the specific language governing permissions and limitations 
-  under the License. 
-  
+  See the License for the specific language governing permissions and limitations
+  under the License.
+
   When distributing the Covered Code, include this CDDL Header Notice in each file
   and include the License file at http://opensource.org/licenses/cddl1.php.
-  If applicable, add the following below this CDDL Header, with the fields 
-  enclosed by brackets [] replaced by your own identifying information: 
+  If applicable, add the following below this CDDL Header, with the fields
+  enclosed by brackets [] replaced by your own identifying information:
   "Portions Copyrighted [year] [name of copyright owner]"
   ====================
+  Portions Copyrighted 2025 Wren Security.
 -->
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
@@ -32,6 +33,7 @@
     <ProductName>FrameworkTests</ProductName>
     <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
     <TargetFrameworkProfile />
+    <NunitPath>$(SolutionDir)\NUnit.Runners.2.6.7\tools</NunitPath>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
     <OutputPath>bin\Debug\</OutputPath>
@@ -55,7 +57,10 @@
   </PropertyGroup>
   <Import Project="$(MSBuildProjectDirectory)\..\Framework.targets" />
   <ItemGroup>
-    <Reference Include="nunit.framework" />
+    <Reference Include="nunit.framework">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>$(NunitPath)\nunit.framework.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core">
       <RequiredTargetFramework>4.0</RequiredTargetFramework>
@@ -173,7 +178,7 @@
     <CreateItem Include="FrameworkTests.dll">
       <Output TaskParameter="Include" ItemName="TestAssembly" />
     </CreateItem>
-    <MSBuild.Community.Tasks.NUnit DisableShadowCopy="true" WorkingDirectory="bin\$(Configuration)" Assemblies="@(TestAssembly)" ContinueOnError="true" ToolPath="$(NUNIT_HOME)\bin" OutputXmlFile="TestResults_$(Configuration).xml" />
+    <MSBuild.Community.Tasks.NUnit DisableShadowCopy="true" WorkingDirectory="bin\$(Configuration)" Assemblies="@(TestAssembly)" ContinueOnError="true" ToolPath="$(NunitPath)" OutputXmlFile="TestResults_$(Configuration).xml" />
   </Target>
   <Target Name="Clean">
     <Delete Files="AssemblyInfo.cs;version.txt" />

diff --git a/ServiceInstall/ServiceInstall.wixproj b/ServiceInstall/ServiceInstall.wixproj
@@ -2,24 +2,25 @@
 <!--
   ====================
   DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-  
-  Copyright 2008-2009 Sun Microsystems, Inc. All rights reserved.     
-  
-  The contents of this file are subject to the terms of the Common Development 
-  and Distribution License("CDDL") (the "License").  You may not use this file 
+
+  Copyright 2008-2009 Sun Microsystems, Inc. All rights reserved.
+
+  The contents of this file are subject to the terms of the Common Development
+  and Distribution License("CDDL") (the "License").  You may not use this file
   except in compliance with the License.
-  
-  You can obtain a copy of the License at 
+
+  You can obtain a copy of the License at
   http://IdentityConnectors.dev.java.net/legal/license.txt
-  See the License for the specific language governing permissions and limitations 
-  under the License. 
-  
+  See the License for the specific language governing permissions and limitations
+  under the License.
+
   When distributing the Covered Code, include this CDDL Header Notice in each file
   and include the License file at identityconnectors/legal/license.txt.
-  If applicable, add the following below this CDDL Header, with the fields 
-  enclosed by brackets [] replaced by your own identifying information: 
+  If applicable, add the following below this CDDL Header, with the fields
+  enclosed by brackets [] replaced by your own identifying information:
   "Portions Copyrighted [year] [name of copyright owner]"
   ====================
+  Portions Copyrighted 2025 Wren Security.
 -->
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
@@ -34,6 +35,7 @@
     <Cultures>en-US</Cultures>
     <SupressIces>ICE45</SupressIces>
     <OpenICFVersion>1.5.2.0-SNAPSHOT</OpenICFVersion>
+    <MSBuildCommunityTasksPath>$(SolutionDir)\MSBuildTasks.1.5.0.235\tools</MSBuildCommunityTasksPath>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
     <ErrorReport>prompt</ErrorReport>
@@ -59,7 +61,7 @@
     <OpenICFVersion>1.5.2.0</OpenICFVersion>
   </PropertyGroup>
   <Import Project="$(WixTargetsPath)" />
-  <Import Project="$(MSBuildExtensionsPath)\MSBuildCommunityTasks\MSBuild.Community.Tasks.Targets" />
+  <Import Project="$(MSBuildCommunityTasksPath)\MSBuild.Community.Tasks.Targets" />
   <ItemGroup>
     <WixExtension Include="WixUtilExtension">
       <HintPath>$(WixExtDir)\WixUtilExtension.dll</HintPath>