Skip to content

Commit

Permalink
🔧 (MigrationTools): update MigrationTools.xml with new branch and com…
Browse files Browse the repository at this point in the history
…mit details

⬆️ (MigrationTools.ConsoleFull): add support for .NET 8.0 and update package references
💡 (EndpointRegistrationExtensions): fix string interpolation in console log

The MigrationTools.xml file is updated to reflect the latest branch, commit, and version details. The MigrationTools.ConsoleFull.csproj file now supports both .NET Framework 4.7.2 and .NET 8.0, allowing for greater flexibility and future-proofing. Additionally, package references are conditionally included based on the target framework to ensure compatibility. The EndpointRegistrationExtensions.cs file is updated to use string interpolation correctly, improving code readability and maintainability.
  • Loading branch information
MrHinsh committed Sep 17, 2024
1 parent 8d4a8c0 commit 40d33eb
Show file tree
Hide file tree
Showing 3 changed files with 28 additions and 17 deletions.
14 changes: 7 additions & 7 deletions docs/Reference/Generated/MigrationTools.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

29 changes: 20 additions & 9 deletions src/MigrationTools.ConsoleFull/MigrationTools.ConsoleFull.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net472</TargetFramework>
<TargetFrameworks>net472; net8.0</TargetFrameworks>

<Product>Azure DevOps Migration Tools [Object Model]</Product>
<AssemblyName>devopsmigration</AssemblyName>
<PlatformTarget>AnyCPU</PlatformTarget>
Expand All @@ -15,6 +16,10 @@
<PackageLicenseFile>LICENSE</PackageLicenseFile>
</PropertyGroup>

<PropertyGroup Condition="'$(TargetFramework)' == 'net8.0'">
<RuntimeIdentifiers>win-x64;linux-x64;osx-x64</RuntimeIdentifiers>
</PropertyGroup>

<ItemGroup>
<Content Include="..\..\appsettings.json" Link="appsettings.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
Expand Down Expand Up @@ -47,21 +52,27 @@
</None>
</ItemGroup>

<ItemGroup>
<PackageReference Include="Azure.Monitor.OpenTelemetry.Exporter" Version="1.3.0" />
<PackageReference Include="Microsoft.TeamFoundationServer.ExtendedClient" Version="19.225.1" />
<PackageReference Include="OpenTelemetry.Exporter.Console" Version="1.9.0" />
<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.9.0" />
<PackageReference Include="OpenTelemetry.Instrumentation.Runtime" Version="1.9.0" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Azure.Monitor.OpenTelemetry.Exporter" Version="1.3.0" />
<PackageReference Include="OpenTelemetry.Exporter.Console" Version="1.9.0" />
<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.9.0" />
<PackageReference Include="OpenTelemetry.Instrumentation.Runtime" Version="1.9.0" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'net472'">
<PackageReference Include="Microsoft.TeamFoundationServer.ExtendedClient" Version="19.225.1" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\MigrationTools.Clients.AzureDevops.Rest\MigrationTools.Clients.AzureDevops.Rest.csproj" />
<ProjectReference Include="..\MigrationTools.Clients.FileSystem\MigrationTools.Clients.FileSystem.csproj" />
<ProjectReference Include="..\MigrationTools.Host\MigrationTools.Host.csproj" />
<ProjectReference Include="..\MigrationTools.Clients.TfsObjectModel\MigrationTools.Clients.TfsObjectModel.csproj" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'net472'">
<ProjectReference Include="..\MigrationTools.Clients.TfsObjectModel\MigrationTools.Clients.TfsObjectModel.csproj" />
</ItemGroup>

<ItemGroup>
<PackageReference Update="Newtonsoft.Json" Version="13.0.3" />
</ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ public static void AddConfiguredEndpoints(this IServiceCollection services, ICon
var endpointType = endpointConfig.GetValue<string>("EndpointType");
if (string.IsNullOrEmpty(endpointType))
{
Console.WriteLine("Endpoint '{EndpointName}' does not have a type configured. Skipping.", endpointName);
Console.WriteLine($"Endpoint '{endpointName}' does not have a type configured. Skipping.");
continue;
}
AddEndPointSingleton(services, configuration, endpointConfig, endpointName, endpointType);
Expand Down

0 comments on commit 40d33eb

Please sign in to comment.