Skip to content

Commit

Permalink
Revert "Replace NuGet.Versioning project with NuGet package. Closes #10
Browse files Browse the repository at this point in the history
… (#14)"

This reverts commit e089494.
  • Loading branch information
jerone committed Nov 16, 2024
1 parent cfb7b17 commit 66383d0
Show file tree
Hide file tree
Showing 38 changed files with 6,159 additions and 4 deletions.
1 change: 1 addition & 0 deletions .csharpierignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
NuGet.Versioning/**
1 change: 0 additions & 1 deletion Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
<PackageVersion Include="Moq" Version="4.20.72" />
<PackageVersion Include="Moq.Contrib.HttpClient" Version="1.4.0" />
<PackageVersion Include="NuGet.Versioning" Version="6.11.1" />
<PackageVersion Include="PosInformatique.Moq.Analyzers" Version="1.11.0" />
<PackageVersion Include="Semver" Version="3.0.0" />
<PackageVersion Include="Verify.Xunit" Version="28.2.0" />
Expand Down
6 changes: 6 additions & 0 deletions Jvw.DevToys.SemverCalculator.sln
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution", "Solution", "{6B
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Jvw.DevToys.SemverCalculator.Tests", "Jvw.DevToys.SemverCalculator.Tests\Jvw.DevToys.SemverCalculator.Tests.csproj", "{4B955671-D767-4D62-848F-63D559328C0A}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NuGet.Versioning", "NuGet.Versioning\NuGet.Versioning.csproj", "{C7AE9E39-00BF-47CC-82ED-9B64F3E935F8}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand All @@ -28,6 +30,10 @@ Global
{4B955671-D767-4D62-848F-63D559328C0A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{4B955671-D767-4D62-848F-63D559328C0A}.Release|Any CPU.ActiveCfg = Release|Any CPU
{4B955671-D767-4D62-848F-63D559328C0A}.Release|Any CPU.Build.0 = Release|Any CPU
{C7AE9E39-00BF-47CC-82ED-9B64F3E935F8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{C7AE9E39-00BF-47CC-82ED-9B64F3E935F8}.Debug|Any CPU.Build.0 = Debug|Any CPU
{C7AE9E39-00BF-47CC-82ED-9B64F3E935F8}.Release|Any CPU.ActiveCfg = Release|Any CPU
{C7AE9E39-00BF-47CC-82ED-9B64F3E935F8}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,12 +57,14 @@
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<!-- Package `Semver` is using a too old version. -->
<PackageReference Include="Microsoft.Extensions.Primitives" />
<PackageReference Include="NuGet.Versioning" />
<PackageReference Include="Microsoft.Extensions.Primitives" /> <!-- Package `Semver` is using a too old version. -->
<PackageReference Include="Semver" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\NuGet.Versioning\NuGet.Versioning.csproj" />
</ItemGroup>

<ItemGroup>
<Compile Update="Resources\Resources.Designer.cs">
<DesignTime>True</DesignTime>
Expand Down
5 changes: 5 additions & 0 deletions NuGet.Versioning/AssemblyInfo.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
using System.Diagnostics.CodeAnalysis;

[assembly: ExcludeFromCodeCoverage(
Justification = "Everything in this project is copied from NuGet.Versioning package."
)]
42 changes: 42 additions & 0 deletions NuGet.Versioning/NuGet.Versioning.csproj
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
</PropertyGroup>

<PropertyGroup>
<!-- Exclude the project from SonarCloud analysis. -->
<SonarQubeExclude>true</SonarQubeExclude>
</PropertyGroup>

<!-- NuGet package configuration (requires DotNet.ReproducibleBuilds package) -->
<PropertyGroup>
<EnablePackageValidation>true</EnablePackageValidation>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<!-- <ContinuousIntegrationBuild>true</ContinuousIntegrationBuild> --><!-- enable when creating package locally -->
</PropertyGroup>

<ItemGroup>
<PackageReference Include="DotNet.ReproducibleBuilds">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
</ItemGroup>

<ItemGroup>
<Compile Update="Resources.Designer.cs">
<DesignTime>True</DesignTime>
<AutoGen>True</AutoGen>
<DependentUpon>Resources.resx</DependentUpon>
</Compile>
</ItemGroup>

<ItemGroup>
<EmbeddedResource Update="Resources.resx">
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
</EmbeddedResource>
</ItemGroup>
</Project>
21 changes: 21 additions & 0 deletions NuGet.Versioning/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
# Why this project?

Everything in this project is copied from `NuGet.Versioning` package.
It is not possible to add the `NuGet.Versioning` package as a package reference, because it's already used by DevToys.
Read here more: https://github.com/DevToys-app/DevToys/discussions/1333#discussioncomment-11053480

## NuGet.Shared

Copied version: https://github.com/chocolatey/NuGet.Client/tree/fd581a266557b3891e16faf4652f28a37ba29685/build/Shared

Latest version: https://github.com/chocolatey/NuGet.Client/tree/develop/build/Shared

## NuGet.Versioning

Copied version: https://github.com/chocolatey/NuGet.Client/tree/fd581a266557b3891e16faf4652f28a37ba29685/src/NuGet.Core/NuGet.Versioning

Latest version: https://github.com/chocolatey/NuGet.Client/tree/develop/src/NuGet.Core/NuGet.Versioning

## Copyright & License

See https://github.com/NuGet/NuGet.Client.
Loading

0 comments on commit 66383d0

Please sign in to comment.