Tidy xml files

fsprojects · Dec 14, 2023 · ca6e0d4 · ca6e0d4
1 parent f447f08
commit ca6e0d4
Show file tree

Hide file tree

Showing 6 changed files with 92 additions and 93 deletions.
diff --git a/Argu.sln b/Argu.sln
@@ -21,14 +21,13 @@ EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "workflows", "workflows", "{EE42293D-9398-4EF4-B151-9DE992EBB85A}"
 	ProjectSection(SolutionItems) = preProject
 		.github\workflows\build.yml = .github\workflows\build.yml
+		.github\workflows\release.yml = .github\workflows\release.yml
 	EndProjectSection
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{2687163A-E0EA-4EC6-A388-430314AA8C85}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".project", ".project", "{2687163A-E0EA-4EC6-A388-430314AA8C85}"
 	ProjectSection(SolutionItems) = preProject
 		.dockerignore = .dockerignore
 		.gitignore = .gitignore
-		.tfignore = .tfignore
-		Argu.sln = Argu.sln
 		build.cmd = build.cmd
 		build.fsx = build.fsx
 		build.sh = build.sh
@@ -39,6 +38,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		LICENSE.md = LICENSE.md
 		README.md = README.md
 		RELEASE_NOTES.md = RELEASE_NOTES.md
+		Directory.Packages.props = Directory.Packages.props
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "docs", "docs", "{C9E28045-41C6-422E-9928-4220EF3FF19B}"
@@ -61,10 +61,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "resource", "resource", "{B1
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{A15390A5-BC39-433F-BA25-8775B4C2E329}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{93AB3CBB-7714-49DD-9C6F-40E153A66E8F}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{E40F0B06-703E-4541-826F-3B8AED67AF7B}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -91,8 +87,6 @@ Global
 		{EE42293D-9398-4EF4-B151-9DE992EBB85A} = {83FE66F8-6E59-4178-8962-11117B51F39C}
 		{10ED3503-22F2-42EF-8B35-C979A5B700D0} = {C9E28045-41C6-422E-9928-4220EF3FF19B}
 		{E0563A30-4451-4DF2-9D21-26C76EB85C22} = {A15390A5-BC39-433F-BA25-8775B4C2E329}
-		{D3E958F9-5FFF-462E-BDC7-A03272A9F5D9} = {93AB3CBB-7714-49DD-9C6F-40E153A66E8F}
-		{8E234746-5098-4400-98F1-62C77AB91711} = {E40F0B06-703E-4541-826F-3B8AED67AF7B}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {99215464-9AB5-4BC3-A033-92EA250F8FC1}

diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,25 +1,25 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <WarningLevel>5</WarningLevel>
-    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-    <DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
-  </PropertyGroup>
+    <PropertyGroup>
+        <WarningLevel>5</WarningLevel>
+        <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+        <DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
+    </PropertyGroup>
 
-  <!-- NuGet Metadata -->
-  <PropertyGroup>
-    <Description>A declarative command line and XML configuration parser for F# applications.</Description>
-    <Authors>Eirik Tsarpalis</Authors>
-    <Copyright>2019</Copyright>
-    <PackageTags>F#, argument, commandline, parser</PackageTags>
-    <!-- NOTE while ReproducibleBuilds/SourceLink derives the same value, other stuff in the FAKE fsx require this explicitly-->
-    <RepositoryUrl>https://github.com/fsprojects/Argu/</RepositoryUrl>
-    <PackageProjectUrl>https://fsprojects.github.io/Argu/</PackageProjectUrl>
-    <PackageLicenseExpression>MIT</PackageLicenseExpression>
-  </PropertyGroup>
-  
-  <!-- FsDocs -->
-  <PropertyGroup>
-    <FsDocsLicenseLink>https://github.com/fsprojects/Argu/blob/master/LICENSE.md</FsDocsLicenseLink>
-    <FsDocsReleaseNotesLink>https://github.com/fsprojects/Argu/blob/master/RELEASE_NOTES.md</FsDocsReleaseNotesLink>
-  </PropertyGroup>
+    <!-- NuGet Metadata -->
+    <PropertyGroup>
+        <Description>A declarative command line and XML configuration parser for F# applications.</Description>
+        <Authors>Eirik Tsarpalis</Authors>
+        <Copyright>2019</Copyright>
+        <PackageTags>F#, argument, commandline, parser</PackageTags>
+        <!-- NOTE while ReproducibleBuilds/SourceLink derives the same value, other stuff in the FAKE fsx require this explicitly-->
+        <RepositoryUrl>https://github.com/fsprojects/Argu/</RepositoryUrl>
+        <PackageProjectUrl>https://fsprojects.github.io/Argu/</PackageProjectUrl>
+        <PackageLicenseExpression>MIT</PackageLicenseExpression>
+    </PropertyGroup>
+
+    <!-- FsDocs -->
+    <PropertyGroup>
+        <FsDocsLicenseLink>https://github.com/fsprojects/Argu/blob/master/LICENSE.md</FsDocsLicenseLink>
+        <FsDocsReleaseNotesLink>https://github.com/fsprojects/Argu/blob/master/RELEASE_NOTES.md</FsDocsReleaseNotesLink>
+    </PropertyGroup>
 </Project>
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -3,13 +3,17 @@
         <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
     </PropertyGroup>
     <ItemGroup>
+        <!-- Build deps -->
+        <PackageVersion Include="DotNet.ReproducibleBuilds" Version="1.1.1" />
+
+        <!-- Impl deps -->
         <PackageVersion Include="FSharp.Core" Version="4.3.2" />
         <PackageVersion Include="System.Configuration.ConfigurationManager" Version="4.4.0" />
+
+        <!-- Test deps -->
         <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
         <PackageVersion Include="xunit" Version="2.4.2" />
         <PackageVersion Include="xunit.runner.visualstudio" Version="2.4.5" />
         <PackageVersion Include="Unquote" Version="6.1.0" />
-        <PackageVersion Include="FsCheck" Version="3.0.0-rc1" />
-        <PackageVersion Include="DotNet.ReproducibleBuilds" Version="1.1.1" />
     </ItemGroup>
 </Project>
diff --git a/samples/Argu.Samples.LS/Argu.Samples.LS.fsproj b/samples/Argu.Samples.LS/Argu.Samples.LS.fsproj
@@ -1,16 +1,16 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
-    <OutputType>Exe</OutputType>
-    <AssemblyName>ls</AssemblyName>
-    <!-- NOTE required as EXEs by default are treated as packable by the FAKE Release fsx   -->
-    <IsPackable>false</IsPackable>
-  </PropertyGroup>
-  <ItemGroup>
-    <Compile Include="Arguments.fs" />
-    <Compile Include="Program.fs" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\src\Argu\Argu.fsproj" />
-  </ItemGroup>
+    <PropertyGroup>
+        <TargetFramework>net6.0</TargetFramework>
+        <OutputType>Exe</OutputType>
+        <AssemblyName>ls</AssemblyName>
+        <!-- NOTE required as EXEs by default are treated as packable by the FAKE Release fsx   -->
+        <IsPackable>false</IsPackable>
+    </PropertyGroup>
+    <ItemGroup>
+        <Compile Include="Arguments.fs"/>
+        <Compile Include="Program.fs"/>
+    </ItemGroup>
+    <ItemGroup>
+        <ProjectReference Include="..\..\src\Argu\Argu.fsproj"/>
+    </ItemGroup>
 </Project>
diff --git a/src/Argu/Argu.fsproj b/src/Argu/Argu.fsproj
@@ -1,30 +1,31 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
-    <GenerateDocumentationFile>true</GenerateDocumentationFile>
-    <GenerateAssemblyInfo>true</GenerateAssemblyInfo>
-    <PackageIcon>logo.png</PackageIcon>
-  </PropertyGroup>
-  <ItemGroup>
-    <Compile Include="Types.fs" />
-    <Compile Include="Attributes.fs" />
-    <Compile Include="Utils.fs" />
-    <Compile Include="ConfigReaders.fs" />
-    <Compile Include="UnionArgInfo.fs" />
-    <Compile Include="PreCompute.fs" />
-    <Compile Include="UnParsers.fs" />
-    <Compile Include="ParseResults.fs" />
-    <Compile Include="Parsers\Common.fs" />
-    <Compile Include="Parsers\Cli.fs" />
-    <Compile Include="Parsers\KeyValue.fs" />
-    <Compile Include="ArgumentParser.fs" />
-    <None Include="..\..\resource\logo.png" Pack="true" PackagePath="" />
-  </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="FSharp.Core" />
-    <PackageReference Include="System.Configuration.ConfigurationManager" />
-    <!-- SourceLink etc -->
-    <PackageReference Include="DotNet.ReproducibleBuilds" PrivateAssets="All" />
-  </ItemGroup>
+<Project Sdk="Microsoft.NET.Sdk">
+    <PropertyGroup>
+        <TargetFramework>netstandard2.0</TargetFramework>
+        <GenerateDocumentationFile>true</GenerateDocumentationFile>
+        <GenerateAssemblyInfo>true</GenerateAssemblyInfo>
+        <PackageIcon>logo.png</PackageIcon>
+    </PropertyGroup>
+    <ItemGroup>
+        <Compile Include="Types.fs"/>
+        <Compile Include="Attributes.fs"/>
+        <Compile Include="Utils.fs"/>
+        <Compile Include="ConfigReaders.fs"/>
+        <Compile Include="UnionArgInfo.fs"/>
+        <Compile Include="PreCompute.fs"/>
+        <Compile Include="UnParsers.fs"/>
+        <Compile Include="ParseResults.fs"/>
+        <Compile Include="Parsers\Common.fs"/>
+        <Compile Include="Parsers\Cli.fs"/>
+        <Compile Include="Parsers\KeyValue.fs"/>
+        <Compile Include="ArgumentParser.fs"/>
+        <None Include="..\..\resource\logo.png" Pack="true" PackagePath=""/>
+    </ItemGroup>
+    <ItemGroup>
+        <!-- SourceLink etc -->
+        <PackageReference Include="DotNet.ReproducibleBuilds" PrivateAssets="All"/>
+
+        <PackageReference Include="FSharp.Core"/>
+
+        <PackageReference Include="System.Configuration.ConfigurationManager"/>
+    </ItemGroup>
 </Project>
diff --git a/tests/Argu.Tests/Argu.Tests.fsproj b/tests/Argu.Tests/Argu.Tests.fsproj
@@ -1,19 +1,19 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
-  </PropertyGroup>
-  <ItemGroup>
-    <Compile Include="Tests.fs" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\src\Argu\Argu.fsproj" />
-  </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="FSharp.Core" VersionOverride="6.0.7" />
-    <PackageReference Include="xunit" />
-    <PackageReference Include="xunit.runner.visualstudio" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" />
-    <PackageReference Include="Unquote" />
-    <PackageReference Include="FsCheck" />
-  </ItemGroup>
+    <PropertyGroup>
+        <TargetFramework>net6.0</TargetFramework>
+    </PropertyGroup>
+    <ItemGroup>
+        <Compile Include="Tests.fs"/>
+    </ItemGroup>
+    <ItemGroup>
+        <ProjectReference Include="..\..\src\Argu\Argu.fsproj"/>
+    </ItemGroup>
+    <ItemGroup>
+        <PackageReference Include="FSharp.Core" VersionOverride="6.0.7"/>
+
+        <PackageReference Include="Microsoft.NET.Test.Sdk"/>
+        <PackageReference Include="Unquote"/>
+        <PackageReference Include="xunit"/>
+        <PackageReference Include="xunit.runner.visualstudio"/>
+    </ItemGroup>
 </Project>