Skip to content

Commit

Permalink
Merge branch 'release/1.4.22'
Browse files Browse the repository at this point in the history
  • Loading branch information
karl-sjogren committed Dec 17, 2024
2 parents f0d203e + a9d5d1c commit 421f2cc
Show file tree
Hide file tree
Showing 57 changed files with 1,097 additions and 242 deletions.
2 changes: 1 addition & 1 deletion Karls.Templates.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<PackageType>Template</PackageType>
<PackageVersion>1.4.21</PackageVersion>
<PackageVersion>1.4.22</PackageVersion>
<PackageId>Karls.Templates</PackageId>
<Title>Karls Templates</Title>
<Authors>Karl-Johan Sjögren</Authors>
Expand Down
11 changes: 11 additions & 0 deletions templates/opinionated-solution/.template.config/template.json
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,17 @@
"args": [ "9.0.*" ]
}
},
"guids": [
"56b5d934-22d2-4d76-a1d4-9298a6bb4ab8",
"2150E333-8FDC-42A3-9474-1A3956D46DE8",
"FAE04EC0-301F-11D3-BF4B-00C04F79EFBC",
"362B8B37-5E5D-4E36-B272-17E0D985B7A0",
"C53909E3-1076-402E-981D-477C340599E7",
"982AABDB-799C-4A5A-817B-421D100AAE99",
"6E055661-9DD9-47EA-BFA4-E20862522A9C",
"23CAAE77-3BA6-47E6-BE31-048D000E3FAC",
"42D2B2C1-C0EA-40B8-9A50-6FE4C43C79C4"
],
"symbols": {
"skipRestore": {
"type": "parameter",
Expand Down
28 changes: 18 additions & 10 deletions templates/opinionated-solution/Directory.Build.props
Original file line number Diff line number Diff line change
@@ -1,24 +1,32 @@
<Project>
<PropertyGroup>
<!-- Solution settings -->
<Version>1.0.0</Version>
<LangVersion>latest</LangVersion>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<UserSecretsId>56b5d934-22d2-4d76-a1d4-9298a6bb4ab8</UserSecretsId>
</PropertyGroup>

<PropertyGroup>
<!-- Build configuration -->
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<WarningsNotAsErrors>NU1901;NU1902;NU1903;NU1904</WarningsNotAsErrors> <!-- A package restored for your project has a known vulnerability. -->
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<NoWarn>$(NoWarn);CS1591;CS1573</NoWarn>
<Deterministic>true</Deterministic>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<DeterministicSourcePaths Condition="'$(TF_BUILD)' == 'True' Or '$(CI)' == 'true'">true</DeterministicSourcePaths>
<EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<NoWarn>$(NoWarn);CS1591;CS1573</NoWarn>
<SatelliteResourceLanguages>en</SatelliteResourceLanguages>
</PropertyGroup>

<PropertyGroup>
<!-- Package restore configuration -->
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
<!--
Dependabot doesn't handle lock files yet and we don't want to miss out on
Dependabot updates. https://github.com/dependabot/dependabot-core/issues/1303
-->
<RestorePackagesWithLockFile>false</RestorePackagesWithLockFile>
<CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
<RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
<RestoreLockedMode Condition="'$(TF_BUILD)' == 'True' Or '$(CI)' == 'true'">true</RestoreLockedMode>
</PropertyGroup>

</Project>
4 changes: 2 additions & 2 deletions templates/opinionated-solution/Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
<PackageVersion Include="Shouldly" Version="4.2.1" />
<PackageVersion Include="TestableIO.System.IO.Abstractions.TestingHelpers" Version="21.1.7" />
<PackageVersion Include="TestableIO.System.IO.Abstractions.Wrappers" Version="21.1.7" />
<PackageVersion Include="xunit.runner.visualstudio" Version="2.8.2" />
<PackageVersion Include="xunit" Version="2.9.2" />
<PackageVersion Include="xunit.runner.visualstudio" Version="3.0.0" />
<PackageVersion Include="xunit.v3" Version="1.0.0" />
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
{
"version": 2,
"dependencies": {
"net9.0": {
"DotNet.ReproducibleBuilds": {
"type": "Direct",
"requested": "[1.2.25, )",
"resolved": "1.2.25",
"contentHash": "xCXiw7BCxHJ8pF6wPepRUddlh2dlQlbr81gXA72hdk4FLHkKXas7EH/n+fk5UCA/YfMqG1Z6XaPiUjDbUNBUzg=="
},
"Karls.Analyzers": {
"type": "Direct",
"requested": "[0.4.3, )",
"resolved": "0.4.3",
"contentHash": "wxr/TDyOx53XaTc5ePx3Kmdcgj0PTH7iiU2cDClbPRiL3/tlvnls3EO6/ah6isyKfBVoXYzWeTiDdHQJ2zpBbQ=="
},
"Microsoft.CodeAnalysis.BannedApiAnalyzers": {
"type": "Direct",
"requested": "[3.3.4, )",
"resolved": "3.3.4",
"contentHash": "0k2Jwpc8eq0hjOtX6TxRkHm9clkJ2PAQ3heEHgqIJZcsfdFosC/iyz18nsgTVDDWpID80rC7aiYK7ripx+Qndg=="
},
"Microsoft.Extensions.Logging.Abstractions": {
"type": "Direct",
"requested": "[9.0.0, )",
"resolved": "9.0.0",
"contentHash": "g0UfujELzlLbHoVG8kPKVBaW470Ewi+jnptGS9KUi6jcb+k2StujtK3m26DFSGGwQ/+bVgZfsWqNzlP6YOejvw==",
"dependencies": {
"Microsoft.Extensions.DependencyInjection.Abstractions": "9.0.0"
}
},
"Roslynator.Analyzers": {
"type": "Direct",
"requested": "[4.12.9, )",
"resolved": "4.12.9",
"contentHash": "X6lDpN/D5wuinq37KIx+l3GSUe9No+8bCjGBTI5sEEtxapLztkHg6gzNVhMXpXw8P+/5gFYxTXJ5Pf8O4iNz/w=="
},
"Roslynator.Formatting.Analyzers": {
"type": "Direct",
"requested": "[4.12.9, )",
"resolved": "4.12.9",
"contentHash": "DOS/WK8xLvqPgD/SDVHQ6vI4T5uhDQftPuCXP1jB0TztzPrlblNud1F+9GhjzPIQrxxzkBmG65rihNErp2WVhg=="
},
"TestableIO.System.IO.Abstractions.Analyzers": {
"type": "Direct",
"requested": "[2022.0.0, )",
"resolved": "2022.0.0",
"contentHash": "rVk7HyTWXC1IOHTLMOzZyX6Wu1qbwVoA17XGF837uUElDnfg4emPxewPpGSgtuJzuJeoH4SGeQtDoB8v9J1d9Q=="
},
"TestableIO.System.IO.Abstractions.Wrappers": {
"type": "Direct",
"requested": "[21.1.7, )",
"resolved": "21.1.7",
"contentHash": "UcQ+kdN0Ibqbhp6uAMAbc06ri7FeQskQFJX+xZD6siVI5Dg7GaeY4dQYqSfbDA5ZPITtXX9Si4E8XhE6Hhufhg==",
"dependencies": {
"TestableIO.System.IO.Abstractions": "21.1.7"
}
},
"Microsoft.Extensions.DependencyInjection.Abstractions": {
"type": "Transitive",
"resolved": "9.0.0",
"contentHash": "+6f2qv2a3dLwd5w6JanPIPs47CxRbnk+ZocMJUhv9NxP88VlOcJYZs9jY+MYSjxvady08bUZn6qgiNh7DadGgg=="
},
"TestableIO.System.IO.Abstractions": {
"type": "Transitive",
"resolved": "21.1.7",
"contentHash": "qsaIAF06PJiFUp1jH2y5NP3IcJILUYtcdGgx25p3D9G4QrFz4Cs3frGp8njX+zQWeb/tHBS+CTMHZtU7Nqa1lg=="
}
}
}
}
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -17,21 +17,21 @@
"test:ci": "vitest run --reporter=junit --coverage --outputFile=test-results/junit.xml"
},
"devDependencies": {
"@codecov/vite-plugin": "^1.5.1",
"@stylistic/eslint-plugin-js": "^2.11.0",
"@codecov/vite-plugin": "^1.6.0",
"@stylistic/eslint-plugin-js": "^2.12.1",
"@stylistic/stylelint-plugin": "^3.1.1",
"@testing-library/dom": "^10.4.0",
"@vitest/browser": "^2.1.8",
"@vitest/coverage-v8": "^2.1.8",
"@vitest/ui": "^2.1.8",
"autoprefixer": "^10.4.20",
"browserslist": "^4.24.2",
"browserslist": "^4.24.3",
"cssnano": "^7.0.6",
"esbuild": "^0.24.0",
"esbuild-plugin-browserslist": "^0.15.0",
"eslint": "^9.16.0",
"eslint-plugin-compat": "^6.0.1",
"eslint-plugin-jsdoc": "^50.6.0",
"eslint": "^9.17.0",
"eslint-plugin-compat": "^6.0.2",
"eslint-plugin-jsdoc": "^50.6.1",
"eslint-plugin-testing-library": "^7.1.1",
"eslint-plugin-vitest": "^0.5.4",
"jsdom": "^25.0.1",
Expand All @@ -41,12 +41,12 @@
"rollup-plugin-copy": "^3.5.0",
"rollup-plugin-visualizer": "^5.12.0",
"sass": "^1.82.0",
"stylelint": "^16.11.0",
"stylelint": "^16.12.0",
"stylelint-config-standard": "^36.0.1",
"stylelint-config-standard-scss": "^14.0.0",
"vite": "^6.0.3",
"vite-plugin-mkcert": "^1.17.6",
"vitest": "^2.1.8",
"webdriverio": "^9.4.1"
"webdriverio": "^9.4.2"
}
}
Loading

0 comments on commit 421f2cc

Please sign in to comment.