Merge pull request #5 from Techsola/ci

Add CI builds and PR validation checks

Author: jnm2

.github/workflows/CI.yml

@@ -0,0 +1,34 @@
+name: CI
+
+on:
+  push:
+    branches: [ main ]
+  pull_request: ~
+
+env:
+  DOTNET_NOLOGO: true
+
+jobs:
+  build:
+
+    runs-on: windows-2022 # Currently, windows-latest is windows-2019 which doesn't have .NET 6
+
+    steps:
+    - uses: actions/checkout@v2
+
+    - name: Pack and test
+      run: ./build.ps1
+
+    - name: Upload bin artifact
+      if: always()
+      uses: actions/upload-artifact@v2
+      with:
+        name: Bin
+        path: artifacts/Bin
+
+    - name: Upload logs artifact
+      if: always()
+      uses: actions/upload-artifact@v2
+      with:
+        name: Logs
+        path: artifacts/Logs

build.ps1

@@ -0,0 +1,29 @@
+$ErrorActionPreference = 'Stop'
+
+# Options
+$configuration = 'Release'
+$artifactsDir = Join-Path (Resolve-Path .) 'artifacts'
+$binDir = Join-Path $artifactsDir 'Bin'
+$testResultsDir = Join-Path $artifactsDir 'Test results'
+$logsDir = Join-Path $artifactsDir 'Logs'
+
+$dotnetArgs = @(
+    '--configuration', $configuration
+    '/p:ContinuousIntegrationBuild=' + ($env:CI -or $env:TF_BUILD)
+)
+
+# Build
+dotnet build /bl:$logsDir\build.binlog @dotnetArgs
+if ($LastExitCode) { exit 1 }
+
+# Publish
+Remove-Item -Recurse -Force $binDir -ErrorAction Ignore
+
+dotnet publish src\TfvcMigrator --no-build --output $binDir /bl:$logsDir\publish.binlog @dotnetArgs
+if ($LastExitCode) { exit 1 }
+
+# Test
+Remove-Item -Recurse -Force $testResultsDir -ErrorAction Ignore
+
+dotnet test --no-build --logger trx --results-directory $testResultsDir /bl:$logsDir\test.binlog @dotnetArgs
+if ($LastExitCode) { exit 1 }

src/TfvcMigrator.Tests/TfvcMigrator.Tests.csproj

@@ -3,15 +3,19 @@
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
     <Nullable>enable</Nullable>
+	<RuntimeIdentifier>win10-x64</RuntimeIdentifier>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="NSubstitute" Version="4.2.2" />
-    <PackageReference Include="NSubstitute.Analyzers.CSharp" Version="1.0.14" />
-    <PackageReference Include="NUnit" Version="3.13.1" />
-    <PackageReference Include="NUnit.Analyzers" Version="3.1.0" />
-    <PackageReference Include="NUnit3TestAdapter" Version="4.0.0-beta.2" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4" />
+    <PackageReference Include="NSubstitute" Version="4.3.0" />
+    <PackageReference Include="NSubstitute.Analyzers.CSharp" Version="1.0.15">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+    <PackageReference Include="NUnit" Version="3.13.2" />
+    <PackageReference Include="NUnit.Analyzers" Version="3.3.0" />
+    <PackageReference Include="NUnit3TestAdapter" Version="4.2.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
     <PackageReference Include="Shouldly" Version="4.0.3" />
   </ItemGroup>
 

src/TfvcMigrator/Program.cs

@@ -13,7 +13,6 @@
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
-using TaskTupleAwaiter;
 using TfvcMigrator.Operations;
 
 namespace TfvcMigrator
@@ -38,13 +37,13 @@ public static Task Main(string[] args)
                     "--root-path-changes",
                     parseArgument: result => result.Tokens.Select(token => ParseRootPathChange(token.Value)).ToImmutableArray())
                 {
-                    Argument = { Arity = ArgumentArity.OneOrMore },
+                    Arity = ArgumentArity.OneOrMore,
                     Description = "Followed by one or more arguments with the format CS1234:$/New/Path. Changes the path that is mapped as the Git repository root to a new path during a specified changeset."
                 },
                 new Option<string?>("--pat") { Description = "Optional PAT, required to access TFVC repositories hosted on Azure DevOps Services. If not provided Default Client Credentials will be used, these are only suitable for on-premise TFS/Azure DevOps Server." },
             };
 
-            command.Handler = CommandHandler.Create(
+            command.SetHandler(
                 new Func<Uri, string, string, string?, int?, int?, ImmutableArray<RootPathChange>, string?, Task >(MigrateAsync));
 
             return command.InvokeAsync(args);

src/TfvcMigrator/TfvcMigrator.csproj

@@ -5,17 +5,30 @@
     <TargetFramework>net6.0</TargetFramework>
     <Nullable>enable</Nullable>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+
+	<Product>TFVC Migrator</Product>
+	<Authors>Technology Solutions Associates</Authors>
+	<Copyright>Copyright © 2020–2022 Technology Solutions Associates</Copyright>
+	<AssemblyTitle>TFVC Migrator</AssemblyTitle>
+
+	<PublishSingleFile>true</PublishSingleFile>
+	<SelfContained>false</SelfContained>
+    <RollForward>Major</RollForward>
+	<RuntimeIdentifier>win10-x64</RuntimeIdentifier>
+	<IncludeNativeLibrariesForSelfExtract>true</IncludeNativeLibrariesForSelfExtract>
+	<EmbedAllSources>true</EmbedAllSources>
+	<DebugType>embedded</DebugType>
   </PropertyGroup>
 
   <ItemGroup>
     <None Include="..\.editorconfig" Link=".editorconfig" />
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="LibGit2Sharp" Version="0.27.0-preview-0096" />
+    <PackageReference Include="LibGit2Sharp" Version="0.27.0-preview-0175" />
     <PackageReference Include="Microsoft.TeamFoundationServer.Client" Version="16.170.0" />
-    <PackageReference Include="System.CommandLine" Version="2.0.0-beta1.20574.7" />
-    <PackageReference Include="TaskTupleAwaiter" Version="1.2.3" />
+    <PackageReference Include="System.CommandLine" Version="2.0.0-beta2.21617.1" />
+    <PackageReference Include="TaskTupleAwaiter" Version="2.0.0" />
   </ItemGroup>
 
 </Project>