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

Jump to bottom

Enable central package management #91

Merged
merged 2 commits into from
May 9, 2024
Merged

Enable central package management #91

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2affd3d
Enable central package management
mhutch May 9, 2024
2ab9187
Update target frameworks
mhutch May 9, 2024
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
1 change: 0 additions & 1 deletion .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ jobs:
- uses: actions/setup-dotnet@v2
with:
dotnet-version: |
6.0.x
8.0.x

- name: Restore
Expand Down
15 changes: 8 additions & 7 deletions Core.Tests/MonoDevelop.Xml.Core.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net48;net6.0</TargetFrameworks>
<TargetFrameworks>net8.0</TargetFrameworks>
<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('Windows'))">net481;net8.0</TargetFrameworks>
<NUnitDisableSupportAssemblies>true</NUnitDisableSupportAssemblies>
<RootNamespace>MonoDevelop.Xml.Tests</RootNamespace>
</PropertyGroup>

<PropertyGroup>
<Nullable>enable</Nullable>
<Nullable Condition="$(TargetFramework)=='net48'">annotations</Nullable>
<Nullable Condition="$(TargetFramework)=='net481'">annotations</Nullable>
</PropertyGroup>

<ItemGroup>
Expand All @@ -25,10 +26,10 @@
<ProjectReference Include="..\Core\MonoDevelop.Xml.Core.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
<PackageReference Include="NUnit" Version="3.14.0" />
<PackageReference Include="NUnit.Analyzers" Version="3.10.0" />
<PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="7.0.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" />
<PackageReference Include="NUnit" />
<PackageReference Include="NUnit.Analyzers" />
<PackageReference Include="NUnit3TestAdapter" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" />
</ItemGroup>
</Project>
10 changes: 5 additions & 5 deletions Core/MonoDevelop.Xml.Core.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net48;net6.0</TargetFrameworks>
<TargetFrameworks>net481;net8.0</TargetFrameworks>
<!--
The assembly is called MonoDevelop.Xml.Core so as not to conflict with the original extension assembly in MonoDevelop
but the root namespace is still MonoDevelop.Xml
Expand All @@ -11,12 +11,12 @@

<PropertyGroup>
<Nullable>enable</Nullable>
<Nullable Condition="$(TargetFramework)=='net48'">annotations</Nullable>
<Nullable Condition="$(TargetFramework)=='net481'">annotations</Nullable>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.1" />
<PackageReference Include="System.Collections.Immutable" Version="7.0.0" />
<PackageReference Include="Microsoft.Bcl.HashCode" Version="1.1.1" Condition="'$(TargetFramework)'=='net48'" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" />
<PackageReference Include="System.Collections.Immutable" />
<PackageReference Include="Microsoft.Bcl.HashCode" Condition="'$(TargetFramework)'=='net481'" />
</ItemGroup>
</Project>
6 changes: 1 addition & 5 deletions Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,6 @@
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)private.snk</AssemblyOriginatorKeyFile>
<LangVersion>latest</LangVersion>
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Nerdbank.GitVersioning" Version="3.6.133" PrivateAssets="all" />
<PackageReference Include="DotNet.ReproducibleBuilds" Version="1.1.1" PrivateAssets="All"/>
</ItemGroup>
</Project>
20 changes: 20 additions & 0 deletions Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
<Project>
<ItemGroup>
<PackageVersion Include="Microsoft.Bcl.HashCode" Version="1.1.1" />
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.1" />
<PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="7.0.0" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
<PackageVersion Include="Microsoft.VisualStudio.ImageCatalog" Version="17.2.32505.113" />
<PackageVersion Include="Microsoft.VisualStudio.Language.Intellisense" Version="17.2.3194" />
<PackageVersion Include="Microsoft.VisualStudio.Language.StandardClassification" Version="17.2.3194" />
<PackageVersion Include="Microsoft.VisualStudio.Threading" Version="17.2.32" />
<PackageVersion Include="NUnit" Version="3.14.0" />
<PackageVersion Include="NUnit.Analyzers" Version="3.10.0" />
<PackageVersion Include="NUnit3TestAdapter" Version="4.5.0" />
<PackageVersion Include="System.Collections.Immutable" Version="7.0.0" />
</ItemGroup>
<ItemGroup>
<GlobalPackageReference Include="Nerdbank.GitVersioning" Version="3.6.133" PrivateAssets="all" />
<GlobalPackageReference Include="DotNet.ReproducibleBuilds" Version="1.1.1" PrivateAssets="All"/>
</ItemGroup>
</Project>
24 changes: 11 additions & 13 deletions Editor.Tests/MonoDevelop.Xml.Editor.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net6.0</TargetFrameworks>
<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('Windows'))">net48;net6.0</TargetFrameworks>
<TargetFrameworks>net8.0</TargetFrameworks>
<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('Windows'))">net481;net8.0</TargetFrameworks>
<NUnitDisableSupportAssemblies>true</NUnitDisableSupportAssemblies>
</PropertyGroup>

Expand All @@ -21,16 +21,14 @@
<None Include="Schema\XmlSchemaNamespaceTests.cs" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="7.0.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
<PackageReference Include="NUnit" Version="3.14.0" />
<PackageReference Include="NUnit.Analyzers" Version="3.10.0" />
<PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.VisualStudio.ImageCatalog" Version="17.2.32505.113" NoWarn="NU1701" />
<PackageReference Include="Microsoft.VisualStudio.Language.Intellisense" Version="17.2.3194" NoWarn="NU1701" />
<PackageReference Include="Microsoft.VisualStudio.Language.StandardClassification" Version="17.2.3194" NoWarn="NU1701" />
<PackageReference Include="Microsoft.VisualStudio.Threading" Version="17.2.32" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" />
<PackageReference Include="Microsoft.NET.Test.Sdk" />
<PackageReference Include="NUnit" />
<PackageReference Include="NUnit.Analyzers" />
<PackageReference Include="NUnit3TestAdapter" />
<PackageReference Include="Microsoft.VisualStudio.ImageCatalog" NoWarn="NU1701" />
<PackageReference Include="Microsoft.VisualStudio.Language.Intellisense" NoWarn="NU1701" />
<PackageReference Include="Microsoft.VisualStudio.Language.StandardClassification" NoWarn="NU1701" />
<PackageReference Include="Microsoft.VisualStudio.Threading" />
</ItemGroup>
</Project>
10 changes: 5 additions & 5 deletions Editor/MonoDevelop.Xml.Editor.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net48;net6.0</TargetFrameworks>
<TargetFrameworks>net481;net8.0</TargetFrameworks>
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\Core\MonoDevelop.Xml.Core.csproj" />
<PackageReference Include="Microsoft.VisualStudio.ImageCatalog" Version="17.2.32505.113" ExcludeAssets="runtime" NoWarn="NU1701" />
<PackageReference Include="Microsoft.VisualStudio.Language.Intellisense" Version="17.2.3194" ExcludeAssets="runtime" NoWarn="NU1701" />
<PackageReference Include="Microsoft.VisualStudio.Language.StandardClassification" Version="17.2.3194" ExcludeAssets="runtime" NoWarn="NU1701" />
<PackageReference Include="Microsoft.VisualStudio.Threading" Version="17.2.32" ExcludeAssets="runtime" />
<PackageReference Include="Microsoft.VisualStudio.ImageCatalog" ExcludeAssets="runtime" NoWarn="NU1701" />
<PackageReference Include="Microsoft.VisualStudio.Language.Intellisense" ExcludeAssets="runtime" NoWarn="NU1701" />
<PackageReference Include="Microsoft.VisualStudio.Language.StandardClassification" ExcludeAssets="runtime" NoWarn="NU1701" />
<PackageReference Include="Microsoft.VisualStudio.Threading" ExcludeAssets="runtime" />
</ItemGroup>

<ItemGroup>
Expand Down
10 changes: 10 additions & 0 deletions MonoDevelop.Xml.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,19 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
ProjectSection(SolutionItems) = preProject
.editorconfig = .editorconfig
Directory.Build.props = Directory.Build.props
Directory.Packages.props = Directory.Packages.props
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "MiniEditor", "MiniEditor", "{EFA73B0E-5240-4FE6-8E78-9E524A70519F}"
ProjectSection(SolutionItems) = preProject
external\MiniEditor\Directory.Build.props = external\MiniEditor\Directory.Build.props
external\MiniEditor\Directory.Packages.props = external\MiniEditor\Directory.Packages.props
EndProjectSection
EndProject
Global
GlobalSection(NestedProjects) = preSolution
{63921982-748E-4CB8-80A9-84E14FB60E1B} = {EFA73B0E-5240-4FE6-8E78-9E524A70519F}
EndGlobalSection
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
Expand Down
2 changes: 1 addition & 1 deletion external/MiniEditor
Open in desktop
Submodule MiniEditor updated 5 files
+3 −4 Directory.Build.props
+19 −0 Directory.Packages.props
+16 −3 Microsoft.VisualStudio.MiniEditor.sln
+9 −12 Microsoft.VisualStudio.MiniEditor/Microsoft.VisualStudio.MiniEditor.csproj
+0 −3 NuGet.Config
Loading