Skip to content

Commit a64d189

Browse files
i4004i4004
committed
Floating version set
Meta info update/reorganized, version set [R] Duplicate references cleanup [R] Version in non-nuget packages removed
1 parent 4909416 commit a64d189

File tree

7 files changed

+28
-26
lines changed

7 files changed

+28
-26
lines changed

‎src/SampleApps/SampleApp.Angular/SampleApp.Angular.csproj

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
<TargetFramework>netcoreapp3.1</TargetFramework>
44
<TypeScriptCompileBlocked>true</TypeScriptCompileBlocked>
55
<TypeScriptToolsVersion>Latest</TypeScriptToolsVersion>
6+
67
<SpaRoot>ClientApp/</SpaRoot>
78
<DefaultItemExcludes>$(DefaultItemExcludes);$(SpaRoot)node_modules\**</DefaultItemExcludes>
89
</PropertyGroup>

‎src/SampleApps/SampleApp.Classic.Tests/SampleApp.Classic.Tests.csproj

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<TargetFrameworks>netcoreapp3.1</TargetFrameworks>
4+
45
<Authors>Alexander Krylkov</Authors>
56
<Product>Simplify</Product>
67
<Description>SampleApp.SelfHosted unit tests</Description>
78
<Copyright>Licensed under LGPL</Copyright>
8-
<Version>1.0</Version>
99
</PropertyGroup>
1010
<ItemGroup>
11-
<PackageReference Include="Appveyor.TestLogger" Version="2.0.0" />
11+
<PackageReference Include="Appveyor.TestLogger" Version="2.0.*" />
1212
<PackageReference Include="coverlet.msbuild" Version="3.0.*" />
1313
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.*" />
14-
<PackageReference Include="NUnit" Version="3.13.1" />
15-
<PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
16-
<PackageReference Include="Moq" Version="4.16.1" />
14+
<PackageReference Include="NUnit" Version="3.13.*" />
15+
<PackageReference Include="NUnit3TestAdapter" Version="3.17.*" />
16+
<PackageReference Include="Moq" Version="4.16.*" />
1717
<ProjectReference Include="..\..\Simplify.Web\Simplify.Web.csproj" />
1818
<ProjectReference Include="..\SampleApp.Classic\SampleApp.Classic.csproj" />
1919
</ItemGroup>

‎src/SampleApps/SampleApp.Classic/SampleApp.Classic.csproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
<Project Sdk="Microsoft.NET.Sdk" InitialTargets="BeforeBuild">
22
<PropertyGroup>
33
<TargetFramework>netcoreapp3.1</TargetFramework>
4+
<OutputType>Exe</OutputType>
5+
<IsPackable>false</IsPackable>
6+
47
<Authors>Alexander Krylkov</Authors>
58
<Product>Simplify</Product>
69
<Description>Simplify.Web self hosted example</Description>
710
<Copyright>Licensed under LGPL</Copyright>
8-
<Version>1.1</Version>
9-
<OutputType>Exe</OutputType>
10-
<IsPackable>false</IsPackable>
1111
</PropertyGroup>
1212
<ItemGroup>
1313
<FrameworkReference Include="Microsoft.AspNetCore.App" />

‎src/SampleApps/SampleApp.Vue.Element/SampleApp.Vue.Element.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
</PropertyGroup>
77
<ItemGroup>
88
<PackageReference Include="Microsoft.AspNetCore.SpaServices.Extensions" Version="3.1.9" />
9-
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
9+
<PackageReference Include="Newtonsoft.Json" Version="12.0.*" />
1010
<ProjectReference Include="..\..\Simplify.Web\Simplify.Web.csproj" />
1111
</ItemGroup>
1212
<ItemGroup>

‎src/SampleApps/SampleApp.WindowsServiceHosted/SampleApp.WindowsServiceHosted.csproj

+4-4
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,17 @@
22
<PropertyGroup>
33
<TargetFrameworks>net462</TargetFrameworks>
44
<LangVersion>9.0</LangVersion>
5+
<OutputType>Exe</OutputType>
6+
<IsPackable>false</IsPackable>
7+
58
<Authors>Alexander Krylkov</Authors>
69
<Product>Simplify</Product>
710
<Description>Simplify.Web as windows service sample app</Description>
811
<Copyright>Licensed under LGPL</Copyright>
9-
<Version>2.0</Version>
10-
<OutputType>Exe</OutputType>
11-
<IsPackable>false</IsPackable>
1212
</PropertyGroup>
1313
<ItemGroup>
1414
<PackageReference Include="Microsoft.AspNetCore" Version="2.2.0" />
15-
<PackageReference Include="Simplify.WindowsServices" Version="2.13.0" />
15+
<PackageReference Include="Simplify.WindowsServices" Version="2.13.*" />
1616
<ProjectReference Include="..\..\Simplify.Web\Simplify.Web.csproj" />
1717
<Reference Include="System.ServiceModel" />
1818
</ItemGroup>

‎src/Simplify.Web.Tests/Simplify.Web.Tests.csproj

+7-4
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,23 @@
44
<LangVersion>9.0</LangVersion>
55
<Nullable>enable</Nullable>
66
<WarningsAsErrors>nullable</WarningsAsErrors>
7-
<Version>2.1.2</Version>
7+
88
<Authors>Alexander Krylkov</Authors>
99
<Product>Simplify</Product>
1010
<Description>Simplify.Web unit tests</Description>
1111
<Copyright>Licensed under LGPL</Copyright>
1212
</PropertyGroup>
1313
<ItemGroup>
14-
<PackageReference Include="Appveyor.TestLogger" Version="2.0.0" />
15-
<PackageReference Include="coverlet.msbuild" Version="3.0.*" />
14+
<PackageReference Include="Appveyor.TestLogger" Version="2.0.*" />
15+
<PackageReference Include="coverlet.msbuild" Version="3.0.*">
16+
<PrivateAssets>all</PrivateAssets>
17+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
18+
</PackageReference>
1619
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.*" />
1720
<PackageReference Include="Moq" Version="4.16.*" />
1821
<PackageReference Include="NUnit" Version="3.13.*" />
1922
<PackageReference Include="NUnit3TestAdapter" Version="3.17.*" />
20-
<PackageReference Include="Simplify.Xml" Version="1.1.*" />
23+
<PackageReference Include="Simplify.Xml" Version="1.2.*" />
2124
</ItemGroup>
2225
<ItemGroup>
2326
<ProjectReference Include="..\Simplify.Web\Simplify.Web.csproj" />

‎src/Simplify.Web/Simplify.Web.csproj

+7-9
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,12 @@
1010
<OutputPath>bin\Any CPU\$(Configuration)\</OutputPath>
1111
<DocumentationFile>bin\Any CPU\$(Configuration)\$(TargetFramework)\Simplify.Web.xml</DocumentationFile>
1212

13-
<Version>4.2.2</Version>
13+
<Version>4.2.3</Version>
1414
<PackageReleaseNotes>
15-
Bug Fixes
16-
* Simplify.Web framework cookies SameSite atrributes set to None with Secured (#111)
1715
Updates
18-
* Simplify.DI upgrade to 4.0.10
19-
* Simplify.System.Sources internal upgrade to 1.3.0
16+
* Simplify.DI bump to 4.0.14
17+
* Simplify.System.Sources internal upgrade to 1.6
18+
* Microsoft.Extensions.Configuration.Json bump to 3.1.12
2019
</PackageReleaseNotes>
2120

2221
<Authors>Alexander Krylkov</Authors>
@@ -35,18 +34,17 @@
3534
</ItemGroup>
3635
<ItemGroup>
3736
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
38-
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="3.1.9" />
39-
<PackageReference Include="Simplify.DI" Version="4.0.13" />
37+
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="3.1.*" />
38+
<PackageReference Include="Simplify.DI" Version="4.0.*" />
4039
<PackageReference Include="Simplify.Templates" Version="2.0.0" />
4140
<PackageReference Include="Simplify.String.Sources" Version="1.2.1" PrivateAssets="All" />
4241
<PackageReference Include="Simplify.System.Sources" Version="1.6.0" PrivateAssets="All" />
4342
<PackageReference Include="Simplify.Xml.Sources" Version="1.1.2" PrivateAssets="All" />
4443
</ItemGroup>
45-
<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.1' Or '$(TargetFramework)' == 'netcoreapp3.1' ">
44+
<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.1' ">
4645
<FrameworkReference Include="Microsoft.AspNetCore.App" />
4746
</ItemGroup>
4847
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' Or '$(TargetFramework)' == 'net462' ">
49-
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
5048
<PackageReference Include="Microsoft.AspNetCore.Http" Version="2.2.2" />
5149
<PackageReference Include="Microsoft.AspNetCore.Http.Extensions" Version="2.2.0" />
5250
<PackageReference Include="Microsoft.AspNetCore.Hosting.Abstractions" Version="2.2.0" />

0 commit comments

Comments
 (0)