Skip to content

Commit

Permalink
Upgrade all dependencies (#2)
Browse files Browse the repository at this point in the history
  • Loading branch information
Gitii authored Feb 12, 2023
1 parent d57c527 commit 3ff6333
Show file tree
Hide file tree
Showing 14 changed files with 158 additions and 63 deletions.
12 changes: 4 additions & 8 deletions .config/dotnet-tools.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,12 @@
"isRoot": true,
"tools": {
"csharpier": {
"version": "0.14.0",
"commands": [
"dotnet-csharpier"
]
"version": "0.16.0",
"commands": ["dotnet-csharpier"]
},
"packedprettier": {
"version": "2.5.1.10",
"commands": [
"pprettier"
]
"commands": ["pprettier"]
}
}
}
}
4 changes: 1 addition & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@ on:
branches:
- main
pull_request:
branches:
- main

jobs:
build:
Expand All @@ -16,8 +14,8 @@ jobs:
uses: actions/setup-dotnet@v1
with:
dotnet-version: |
5.0.x
6.0.x
7.0.x
- name: Add msbuild to PATH
uses: microsoft/[email protected]
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ jobs:
uses: actions/setup-dotnet@v1
with:
dotnet-version: |
5.0.x
6.0.x
7.0.x
include-prerelease: true
- name: Add msbuild to PATH
uses: microsoft/[email protected]
Expand Down
77 changes: 77 additions & 0 deletions .my-config/bootstrap.ps1
Original file line number Diff line number Diff line change
@@ -0,0 +1,77 @@
function Get-ScriptFolder() {
$fp = $PSScriptRoot

if ($fp) {
return $fp
}

return $(split-path -parent $MyInvocation.MyCommand.Definition)
}

function New-TemporaryDirectory {
$parent = [System.IO.Path]::GetTempPath()
[string] $name = [System.Guid]::NewGuid()
[string] $path = Join-Path $parent $name
New-Item -ItemType Directory -Path $path | Out-Null

return $path
}

function Extract-Zip($ArchivePath, $TargetDirectory) {
Add-Type -Assembly "System.IO.Compression.Filesystem"
$ar = [System.IO.Compression.ZipFile]::OpenRead($tempFile.FullName)

$ar.Entries | ? { $_.Name -ne "" } | % {
$entry = $_

$directory = Split-Path $entry.FullName
$fullTargetDirectory = Join-Path $TargetDirectory $directory

New-Item -ItemType Directory $fullTargetDirectory -Force | Out-Null

$fullTargetFilePath = Join-Path $fullTargetDirectory $entry.Name

Write-Debug "Extracting $($entry.Name) to $fullTargetFilePath"

$stream = New-Object -TypeName System.IO.FileStream -ArgumentList @($fullTargetFilePath, [System.IO.FileMode]::OpenOrCreate)

$entryStream = $entry.Open()

$entryStream.CopyTo($stream)

$stream.Close()
$entryStream.Close()
}

$ar.Dispose()

}

function Extract-Config($TargetDirectory) {
$tempFile = New-TemporaryFile
$tempFolder = New-TemporaryDirectory

try {
$url = 'https://github.com/Gitii/config/archive/refs/heads/main.zip'

Write-Host "Downloading..."
Invoke-WebRequest -Uri $url -OutFile $tempFile.FullName

Write-Host "Extracting to $tempFolder..."
Extract-Zip -ArchivePath $tempFile.FullName -TargetDirectory $tempFolder

$templateFolder = Join-Path $tempFolder "config-main" "templates"

Write-Host "Copying templates to $TargetDirectory"
Get-ChildItem -Path $templateFolder -Force | Copy-Item -Recurse -Destination $TargetDirectory -Force

} finally {
$tempFile.Delete()

Remove-Item $tempFolder -Recurse -Force
}
}

$targetDir = Get-Location

Extract-Config -TargetDirectory $targetDir
16 changes: 16 additions & 0 deletions .my-config/update.ps1
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
function Get-ScriptFolder() {
$fp = $PSScriptRoot

if ($fp) {
return $fp
}

return $(split-path -parent $MyInvocation.MyCommand.Definition)
}

$currDir = Get-ScriptFolder

& "$currDir/bootstrap.ps1"



4 changes: 4 additions & 0 deletions .onsaveconfig
Original file line number Diff line number Diff line change
@@ -1,15 +1,19 @@
[*.cs]
command = dotnet
arguments = csharpier "{file}"
always_run = true

[*.{js,ts,css,less,scss,vue,json,gql,md,yml,yaml,html,htm}]
command = dotnet
arguments = pprettier --write "{file}"
always_run = true

[*.{xml,csproj,xaml,appxmanifest,props,wapproj}]
command = dotnet
arguments = pprettier --write "{file}" --plugin "<NodeModulesPath>/@prettier/plugin-xml" --parser "xml" --print-width 120 --xml-whitespace-sensitivity "ignore" --tab-width 4
always_run = true

[*.sh]
command = dotnet
arguments = pprettier --write "{file}" --plugin "<NodeModulesPath>/prettier-plugin-sh"
always_run = true
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net6.0-windows10.0.19041.0;net5.0-windows10.0.19041.0</TargetFrameworks>
<TargetFrameworks>net6.0-windows10.0.19041.0;net7.0-windows10.0.19041.0</TargetFrameworks>
<TargetPlatformMinVersion>10.0.19041.0</TargetPlatformMinVersion>
<RootNamespace>Community.Sextant.WinUI.Microsoft.Extensions.DependencyInjection</RootNamespace>
<RuntimeIdentifiers>win10-x86;win10-x64;win10-arm64</RuntimeIdentifiers>
Expand All @@ -17,8 +17,8 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.0.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.2.230118.102" />
<PackageReference Include="Sextant" Version="2.12.4" />
</ItemGroup>

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net6.0-windows10.0.19041.0;net5.0-windows10.0.19041.0</TargetFrameworks>
<TargetFrameworks>net6.0-windows10.0.19041.0;net7.0-windows10.0.19041.0</TargetFrameworks>
<TargetPlatformMinVersion>10.0.19041.0</TargetPlatformMinVersion>
<RootNamespace>Community.Sextant.WinUI.Splat</RootNamespace>
<RuntimeIdentifiers>win10-x86;win10-x64;win10-arm64</RuntimeIdentifiers>
Expand All @@ -17,9 +17,9 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.0.0" />
<PackageReference Include="ReactiveUI" Version="17.1.17" />
<PackageReference Include="Splat" Version="14.1.17" />
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.2.230118.102" />
<PackageReference Include="ReactiveUI" Version="18.4.20" />
<PackageReference Include="Splat" Version="14.6.8" />
</ItemGroup>

<ItemGroup>
Expand Down
16 changes: 10 additions & 6 deletions Community.Sextant.WinUI.Tests/Community.Sextant.WinUI.Tests.csproj
Original file line number Diff line number Diff line change
@@ -1,18 +1,22 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net6.0-windows10.0.20348.0</TargetFramework>
<RuntimeIdentifiers>win10-x86;win10-x64;win10-arm64</RuntimeIdentifiers>
<Nullable>enable</Nullable>

<IsPackable>false</IsPackable>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="FakeItEasy" Version="7.3.0" />
<PackageReference Include="FluentAssertions" Version="6.4.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
<PackageReference Include="NUnit" Version="3.13.2" />
<PackageReference Include="NUnit3TestAdapter" Version="4.2.1" />
<PackageReference Include="coverlet.collector" Version="3.1.0" />
<PackageReference Include="FakeItEasy" Version="7.3.1" />
<PackageReference Include="FluentAssertions" Version="6.10.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
<PackageReference Include="NUnit" Version="3.13.3" />
<PackageReference Include="NUnit3TestAdapter" Version="4.3.1" />
<PackageReference Include="coverlet.collector" Version="3.2.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="System.Reactive" Version="5.0.0" />
</ItemGroup>

Expand Down
4 changes: 2 additions & 2 deletions Community.Sextant.WinUI/Community.Sextant.WinUI.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net6.0-windows10.0.19041.0;net5.0-windows10.0.19041.0</TargetFrameworks>
<TargetFrameworks>net6.0-windows10.0.19041.0;net7.0-windows10.0.19041.0</TargetFrameworks>
<TargetPlatformMinVersion>10.0.19041.0</TargetPlatformMinVersion>
<RootNamespace>Community.Sextant.WinUI</RootNamespace>
<RuntimeIdentifiers>win10-x86;win10-x64;win10-arm64</RuntimeIdentifiers>
Expand All @@ -17,7 +17,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.0.0" />
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.2.230118.102" />
<PackageReference Include="Sextant" Version="2.12.4" />
</ItemGroup>

Expand Down
52 changes: 26 additions & 26 deletions Directory.Build.props
Original file line number Diff line number Diff line change
@@ -1,28 +1,28 @@
<Project>
<PropertyGroup>
<LangVersion>latest</LangVersion>
<Nullable>enable</Nullable>
<EnforceCodeStyleInBuild>True</EnforceCodeStyleInBuild>
<EnableNETAnalyzers>True</EnableNETAnalyzers>
<AnalysisLevel>latest</AnalysisLevel>
<IsPackable>false</IsPackable>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="6.0.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Meziantou.Analyzer" Version="1.0.688">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.0.64">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
<PackageReference Include="AsyncFixer" Version="1.5.1">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
</ItemGroup>
<PropertyGroup>
<LangVersion>latest</LangVersion>
<Nullable>enable</Nullable>
<EnforceCodeStyleInBuild>True</EnforceCodeStyleInBuild>
<EnableNETAnalyzers>True</EnableNETAnalyzers>
<AnalysisLevel>latest</AnalysisLevel>
<IsPackable>false</IsPackable>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="7.0.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Meziantou.Analyzer" Version="2.0.14">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.5.22">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
<PackageReference Include="AsyncFixer" Version="1.6.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
</ItemGroup>
</Project>
4 changes: 2 additions & 2 deletions SextantSample.Core/SextantSample.WinUI.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
<None Remove="Views\RootView.xaml" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.0.0" />
<PackageReference Include="ReactiveUI.WinUI" Version="17.1.17" />
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.2.230118.102" />
<PackageReference Include="ReactiveUI.WinUI" Version="18.4.20" />
<PackageReference Include="Sextant" Version="2.12.4" />
</ItemGroup>
<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Hosting" Version="6.0.0" />
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.0.0" />
<PackageReference Include="ReactiveUI.WinUI" Version="17.1.17" />
<PackageReference Include="Splat.Microsoft.Extensions.DependencyInjection" Version="14.1.17" />
<PackageReference Include="Microsoft.Extensions.Hosting" Version="7.0.0" />
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.2.230118.102" />
<PackageReference Include="ReactiveUI.WinUI" Version="18.4.20" />
<PackageReference Include="Splat.Microsoft.Extensions.DependencyInjection" Version="14.6.8" />
<Manifest Include="$(ApplicationManifest)" />
</ItemGroup>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,11 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Hosting" Version="6.0.0" />
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.0.0" />
<PackageReference Include="ReactiveUI.WinUI" Version="17.1.17" />
<PackageReference Include="Microsoft.Extensions.Hosting" Version="7.0.0" />
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.2.230118.102" />
<PackageReference Include="ReactiveUI.WinUI" Version="18.4.20" />
<PackageReference Include="Sextant" Version="2.12.4" />
<PackageReference Include="Splat" Version="14.1.17" />
<PackageReference Include="Splat" Version="14.6.8" />
<Manifest Include="$(ApplicationManifest)" />
</ItemGroup>

Expand Down

0 comments on commit 3ff6333

Please sign in to comment.