Skip to content

Commit afe2f5d

Browse files
committed
Merge branch 'main' into v1.0
2 parents 493ad36 + 8890526 commit afe2f5d

8 files changed

Lines changed: 13 additions & 12 deletions

File tree

Directory.build.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<PackageProjectUrl>https://shinylib.net</PackageProjectUrl>
2020
<PackageTags>sqlite shiny spatial geospatial</PackageTags>
2121

22-
<MauiVersion>10.0.41</MauiVersion>
22+
<MauiVersion>10.0.51</MauiVersion>
2323
</PropertyGroup>
2424

2525
<PropertyGroup Condition="'$(Configuration)' == 'Release'">

Directory.build.targets

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<Project>
2+
<ItemGroup>
3+
<PackageReference Include="Nerdbank.GitVersioning">
4+
<PrivateAssets>all</PrivateAssets>
5+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
6+
</PackageReference>
7+
</ItemGroup>
8+
</Project>

Directory.packages.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project>
22
<PropertyGroup>
33
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
4-
<ShinyVersion>4.0.0-beta-0095</ShinyVersion>
4+
<ShinyVersion>4.0.1</ShinyVersion>
55
</PropertyGroup>
66
<ItemGroup>
77
<PackageVersion Include="Microsoft.Maui.Controls" Version="$(MauiVersion)"/>

Shiny.Spatial.slnx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
<File Path=".github\workflows\build.yml" />
55
<File Path="build.slnf" />
66
<File Path="Directory.build.props" />
7+
<File Path="Directory.build.targets" />
78
<File Path="Directory.packages.props" />
89
<File Path="global.json" />
910
<File Path="LICENSE" />

samples/Sample.Maui/Sample.Maui.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<ApplicationDisplayVersion>1.0</ApplicationDisplayVersion>
1515

1616
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">15.0</SupportedOSPlatformVersion>
17-
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">21.0</SupportedOSPlatformVersion>
17+
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">23.0</SupportedOSPlatformVersion>
1818
</PropertyGroup>
1919

2020
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">

src/Shiny.Spatial.Geofencing/Shiny.Spatial.Geofencing.csproj

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,5 @@
1212
<ItemGroup>
1313
<ProjectReference Include="../Shiny.Spatial/Shiny.Spatial.csproj"/>
1414
<PackageReference Include="Shiny.Locations"/>
15-
<PackageReference Include="Nerdbank.GitVersioning">
16-
<PrivateAssets>all</PrivateAssets>
17-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
18-
</PackageReference>
1915
</ItemGroup>
2016
</Project>

src/Shiny.Spatial/Shiny.Spatial.csproj

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,5 @@
66

77
<ItemGroup>
88
<PackageReference Include="Microsoft.Data.Sqlite"/>
9-
<PackageReference Include="Nerdbank.GitVersioning">
10-
<PrivateAssets>all</PrivateAssets>
11-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
12-
</PackageReference>
139
</ItemGroup>
1410
</Project>

version.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/main/src/NerdBank.GitVersioning/version.schema.json",
3-
"version": "1.0.1",
3+
"version": "1.1.0",
44
"assemblyVersion": {
55
"precision": "revision"
66
},

0 commit comments

Comments
 (0)