Updating dotfiles

distantcam · Jul 25, 2024 · 5b8c9d1 · 5b8c9d1
1 parent b29d899
commit 5b8c9d1
Show file tree

Hide file tree

Showing 4 changed files with 121 additions and 170 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -3,7 +3,6 @@
 # Common settings that generally should always be used with your language specific settings
 
 # Auto detect text files and perform LF normalization
-# https://www.davidlaing.com/2012/09/19/customise-your-gitattributes-to-become-a-git-ninja/
 *          text=auto
 
 #
@@ -12,26 +11,28 @@
 
 # Documents
 *.bibtex   text diff=bibtex
-*.doc	        diff=astextplain
-*.DOC	        diff=astextplain
-*.docx          diff=astextplain
-*.DOCX          diff=astextplain
-*.dot           diff=astextplain
-*.DOT           diff=astextplain
-*.pdf           diff=astextplain
-*.PDF           diff=astextplain
-*.rtf           diff=astextplain
-*.RTF	        diff=astextplain
-*.md       text
+*.doc      diff=astextplain
+*.DOC      diff=astextplain
+*.docx     diff=astextplain
+*.DOCX     diff=astextplain
+*.dot      diff=astextplain
+*.DOT      diff=astextplain
+*.pdf      diff=astextplain
+*.PDF      diff=astextplain
+*.rtf      diff=astextplain
+*.RTF      diff=astextplain
+*.md       text diff=markdown
+*.mdx      text diff=markdown
 *.tex      text diff=tex
 *.adoc     text
 *.textile  text
 *.mustache text
-*.csv      text
+*.csv      text eol=crlf
 *.tab      text
 *.tsv      text
 *.txt      text
 *.sql      text
+*.epub     diff=astextplain
 
 # Graphics
 *.png      binary
@@ -41,7 +42,7 @@
 *.tif      binary
 *.tiff     binary
 *.ico      binary
-# SVG treated as an asset (binary) by default.
+# SVG treated as text by default.
 *.svg      text
 # If you want to treat it as binary,
 # use the following line instead.
@@ -52,6 +53,7 @@
 *.bash     text eol=lf
 *.fish     text eol=lf
 *.sh       text eol=lf
+*.zsh      text eol=lf
 # These are explicitly windows files and should use crlf
 *.bat      text eol=crlf
 *.cmd      text eol=crlf
@@ -80,64 +82,17 @@
 
 .gitattributes export-ignore
 .gitignore     export-ignore
+.gitkeep       export-ignore
 # Auto detect text files and perform LF normalization
-# https://www.davidlaing.com/2012/09/19/customise-your-gitattributes-to-become-a-git-ninja/
-*    text=auto
-
-*.cs text diff=csharp
-###############################################################################
-# Set default behavior to automatically normalize line endings.
-###############################################################################
-*            text=auto
-
-###############################################################################
-# Set the merge driver for project and solution files
-#
-# Merging from the command prompt will add diff markers to the files if there
-# are conflicts (Merging from VS is not affected by the settings below, in VS
-# the diff markers are never inserted). Diff markers may cause the following
-# file extensions to fail to load in VS. An alternative would be to treat
-# these files as binary and thus will always conflict and require user
-# intervention with every merge. To do so, just comment the entries below and
-# uncomment the group further below
-###############################################################################
-
-*.sln        text eol=crlf
-*.csproj     text eol=crlf
-*.vbproj     text eol=crlf
-*.vcxproj    text eol=crlf
-*.vcproj     text eol=crlf
-*.dbproj     text eol=crlf
-*.fsproj     text eol=crlf
-*.lsproj     text eol=crlf
-*.wixproj    text eol=crlf
-*.modelproj  text eol=crlf
-*.sqlproj    text eol=crlf
-*.wmaproj    text eol=crlf
-
-*.xproj      text eol=crlf
-*.props      text eol=crlf
-*.filters    text eol=crlf
-*.vcxitems   text eol=crlf
-
+*          text=auto
 
-#*.sln       merge=binary
-#*.csproj    merge=binary
-#*.vbproj    merge=binary
-#*.vcxproj   merge=binary
-#*.vcproj    merge=binary
-#*.dbproj    merge=binary
-#*.fsproj    merge=binary
-#*.lsproj    merge=binary
-#*.wixproj   merge=binary
-#*.modelproj merge=binary
-#*.sqlproj   merge=binary
-#*.wwaproj   merge=binary
+*.cs       text diff=csharp
+*.cshtml   text diff=html
+*.csx      text diff=csharp
+*.sln      text eol=crlf
+*.csproj   text eol=crlf
 
-#*.xproj     merge=binary
-#*.props     merge=binary
-#*.filters   merge=binary
-#*.vcxitems  merge=binary
+### Custom ###
 
 # https://github.com/VerifyTests/Verify#verified
 *.verified.cs text eol=lf
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,3 @@
-# File created using '.gitignore Generator' for Visual Studio Code: https://bit.ly/vscode-gig
 # Created by https://www.toptal.com/developers/gitignore/api/visualstudio
 # Edit at https://www.toptal.com/developers/gitignore?templates=visualstudio
 
@@ -409,6 +408,3 @@ FodyWeavers.xsd
 
 # https://github.com/VerifyTests/Verify#received
 *.received.*
-
-# https://github.com/dotnet/roslyn/issues/50451
-Generated/
diff --git a/src/AutoCtor.Example/AutoCtor.Example.csproj b/src/AutoCtor.Example/AutoCtor.Example.csproj
@@ -1,19 +1,19 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
-    <Nullable>disable</Nullable>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Polyfill" Version="6.0.0">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\AutoCtor.Attributes\AutoCtor.Attributes.csproj" />
-  </ItemGroup>
-
-</Project>
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <Nullable>disable</Nullable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Polyfill" Version="6.0.0">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\AutoCtor.Attributes\AutoCtor.Attributes.csproj" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/AutoCtor.Tests/AutoCtor.Tests.csproj b/src/AutoCtor.Tests/AutoCtor.Tests.csproj
@@ -1,79 +1,79 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
-    <IsPackable>false</IsPackable>
-    <NoWarn>CS0169;CS0414</NoWarn>
-  </PropertyGroup>
-
-  <PropertyGroup>
-    <!--<RoslynVersion>3.11</RoslynVersion>-->
-    <!--<RoslynVersion>4.4</RoslynVersion>-->
-    <!--<RoslynVersion>4.6</RoslynVersion>-->
-    <!--<RoslynVersion>4.8</RoslynVersion>-->
-    <RoslynVersion>4.10</RoslynVersion>
-  </PropertyGroup>
-
-  <PropertyGroup>
-    <IntermediateOutputPath>obj\roslyn$(RoslynVersion)\</IntermediateOutputPath>
-    <OutputPath>bin\roslyn$(RoslynVersion)\</OutputPath>
-  </PropertyGroup>
-
-  <PropertyGroup Condition=" '$(RoslynVersion)' == '3.11' ">
-    <DefineConstants>$(DefineConstants);ROSLYN_3;ROSLYN_3_11</DefineConstants>
-    <RoslynLibVersion>4.10.0</RoslynLibVersion>
-  </PropertyGroup>
-
-  <PropertyGroup Condition=" '$(RoslynVersion)' == '4.4' ">
-    <DefineConstants>$(DefineConstants);ROSLYN_4;ROSLYN_4_4</DefineConstants>
-    <RoslynLibVersion>4.10.0</RoslynLibVersion>
-  </PropertyGroup>
-
-  <PropertyGroup Condition=" '$(RoslynVersion)' == '4.6' ">
-    <DefineConstants>$(DefineConstants);ROSLYN_4;ROSLYN_4_6</DefineConstants>
-    <RoslynLibVersion>4.10.0</RoslynLibVersion>
-  </PropertyGroup>
-
-  <PropertyGroup Condition=" '$(RoslynVersion)' == '4.8' ">
-    <DefineConstants>$(DefineConstants);ROSLYN_4;ROSLYN_4_8</DefineConstants>
-    <RoslynLibVersion>4.10.0</RoslynLibVersion>
-  </PropertyGroup>
-
-  <PropertyGroup Condition=" '$(RoslynVersion)' == '4.10' ">
-    <DefineConstants>$(DefineConstants);ROSLYN_4;ROSLYN_4_10</DefineConstants>
-    <RoslynLibVersion>4.10.0</RoslynLibVersion>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <Compile Remove="Examples\*.cs" />
-    <Compile Remove="GuardExamples\*.cs" />
-    <Compile Remove="LangExamples\*.cs" />
-    <None Include="Examples\*.cs" />
-    <None Include="GuardExamples\*.cs" />
-    <None Include="LangExamples\*.cs" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="AutoHelpers.Tests" Version="0.4.0" />
-    <PackageReference Include="FluentAssertions" Version="6.12.0" />
-    <PackageReference Include="GitHubActionsTestLogger" Version="2.4.1" PrivateAssets="all" />
-    <PackageReference Include="MarkdownSnippets.MsBuild" Version="27.0.2" PrivateAssets="all" />
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.SourceGenerators.Testing.XUnit" Version="1.1.2" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
-    <PackageReference Include="Verify.SourceGenerators" Version="2.2.0" />
-    <PackageReference Include="Verify.Xunit" Version="26.0.1" />
-    <PackageReference Include="xunit" Version="2.9.0" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.8.2" PrivateAssets="all" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\AutoCtor.Attributes\AutoCtor.Attributes.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="$(RoslynLibVersion)" />
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="$(RoslynLibVersion)" />
-    <ProjectReference Include="..\AutoCtor.Roslyn$(RoslynVersion)\AutoCtor.Roslyn$(RoslynVersion).csproj" />
-  </ItemGroup>
-
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net8.0</TargetFramework>
+    <IsPackable>false</IsPackable>
+    <NoWarn>CS0169;CS0414</NoWarn>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <!--<RoslynVersion>3.11</RoslynVersion>-->
+    <!--<RoslynVersion>4.4</RoslynVersion>-->
+    <!--<RoslynVersion>4.6</RoslynVersion>-->
+    <!--<RoslynVersion>4.8</RoslynVersion>-->
+    <RoslynVersion>4.10</RoslynVersion>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <IntermediateOutputPath>obj\roslyn$(RoslynVersion)\</IntermediateOutputPath>
+    <OutputPath>bin\roslyn$(RoslynVersion)\</OutputPath>
+  </PropertyGroup>
+
+  <PropertyGroup Condition=" '$(RoslynVersion)' == '3.11' ">
+    <DefineConstants>$(DefineConstants);ROSLYN_3;ROSLYN_3_11</DefineConstants>
+    <RoslynLibVersion>4.10.0</RoslynLibVersion>
+  </PropertyGroup>
+
+  <PropertyGroup Condition=" '$(RoslynVersion)' == '4.4' ">
+    <DefineConstants>$(DefineConstants);ROSLYN_4;ROSLYN_4_4</DefineConstants>
+    <RoslynLibVersion>4.10.0</RoslynLibVersion>
+  </PropertyGroup>
+
+  <PropertyGroup Condition=" '$(RoslynVersion)' == '4.6' ">
+    <DefineConstants>$(DefineConstants);ROSLYN_4;ROSLYN_4_6</DefineConstants>
+    <RoslynLibVersion>4.10.0</RoslynLibVersion>
+  </PropertyGroup>
+
+  <PropertyGroup Condition=" '$(RoslynVersion)' == '4.8' ">
+    <DefineConstants>$(DefineConstants);ROSLYN_4;ROSLYN_4_8</DefineConstants>
+    <RoslynLibVersion>4.10.0</RoslynLibVersion>
+  </PropertyGroup>
+
+  <PropertyGroup Condition=" '$(RoslynVersion)' == '4.10' ">
+    <DefineConstants>$(DefineConstants);ROSLYN_4;ROSLYN_4_10</DefineConstants>
+    <RoslynLibVersion>4.10.0</RoslynLibVersion>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Remove="Examples\*.cs" />
+    <Compile Remove="GuardExamples\*.cs" />
+    <Compile Remove="LangExamples\*.cs" />
+    <None Include="Examples\*.cs" />
+    <None Include="GuardExamples\*.cs" />
+    <None Include="LangExamples\*.cs" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="AutoHelpers.Tests" Version="0.4.0" />
+    <PackageReference Include="FluentAssertions" Version="6.12.0" />
+    <PackageReference Include="GitHubActionsTestLogger" Version="2.4.1" PrivateAssets="all" />
+    <PackageReference Include="MarkdownSnippets.MsBuild" Version="27.0.2" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.SourceGenerators.Testing.XUnit" Version="1.1.2" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
+    <PackageReference Include="Verify.SourceGenerators" Version="2.2.0" />
+    <PackageReference Include="Verify.Xunit" Version="26.0.1" />
+    <PackageReference Include="xunit" Version="2.9.0" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.8.2" PrivateAssets="all" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\AutoCtor.Attributes\AutoCtor.Attributes.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="$(RoslynLibVersion)" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="$(RoslynLibVersion)" />
+    <ProjectReference Include="..\AutoCtor.Roslyn$(RoslynVersion)\AutoCtor.Roslyn$(RoslynVersion).csproj" />
+  </ItemGroup>
+
 </Project>