Skip to content

Commit 5c8b83d

Browse files
rzanderrzander
committed
New: Upgrade to Redis 5.0 and .NETCore 2.1
1 parent 9e52310 commit 5c8b83d

File tree

8 files changed

+111
-471
lines changed

8 files changed

+111
-471
lines changed

‎examples/Windows Inventory/inventory.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ getinv -Name "Printer" -WMIClass "Win32_Printer" -Properties @("DeviceID","Capab
196196
$user = Get-LocalUser | Select-Object Description, Enabled, UserMayChangePassword, PasswordRequired, Name, @{N = '@PasswordLastSet'; E = {[System.DateTime](($_.PasswordLastSet).ToUniversalTime())}}, @{N = 'id'; E = {$_.SID}} | Sort-Object -Property Name
197197
$object | Add-Member -MemberType NoteProperty -Name "LocalUsers" -Value ($user)
198198

199-
$locAdmin = Get-LocalGroupMember -SID S-1-5-32-544 | Select-Object @{N = 'Name'; E = {$_.Name.Replace($($env:Computername) + "\", "")}}, PrincipalSource, ObjectClass | Sort-Object -Property Name
199+
$locAdmin = Get-LocalGroupMember -SID S-1-5-32-544 | Select-Object @{N = 'Name'; E = {$_.Name.Replace($($env:Computername) + "\", "")}}, ObjectClass, @{Name = 'id'; Expression = {$_.SID.Value}} | Sort-Object -Property Name
200200
$object | Add-Member -MemberType NoteProperty -Name "LocalAdmins" -Value ($locAdmin)
201201

202202
$locGroup = Get-LocalGroup | Select-Object Description, Name, PrincipalSource, ObjectClass, @{N = 'id'; E = {$_.SID}} | Sort-Object -Property Name

‎source/JainDBTest/JainDBTest.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>netcoreapp2.0</TargetFramework>
4+
<TargetFramework>netcoreapp2.1</TargetFramework>
55

66
<IsPackable>false</IsPackable>
77

@@ -11,7 +11,7 @@
1111
</PropertyGroup>
1212

1313
<ItemGroup>
14-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.8.0" />
14+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
1515
<PackageReference Include="MSTest.TestAdapter" Version="1.3.2" />
1616
<PackageReference Include="MSTest.TestFramework" Version="1.3.2" />
1717
</ItemGroup>

‎source/JainDBTest/UnitTest1.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ public void Test_Query()
7272
{
7373
Console.WriteLine("Query data...");
7474
jDB.UseFileStore = true;
75-
int i = jDB.Query("obj1", "", "").Count();
75+
int i = jDB.QueryAsync("obj1", "", "", "").Result.Count();
7676
Assert.IsTrue(i > 0);
7777
}
7878

‎source/jaindb/Controllers/HomeController.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -291,7 +291,7 @@ public JArray Query()
291291
//string sUri = Microsoft.AspNetCore.Http.Extensions.UriHelper.GetDisplayUrl(Request);
292292
var query = QueryHelpers.ParseQuery(sQuery);
293293

294-
return jDB.Query(string.Join(";", query.Where(t => string.IsNullOrEmpty(t.Value)).Select(t => t.Key).ToList()), query.FirstOrDefault(t => t.Key.ToLower() == "$select").Value, query.FirstOrDefault(t => t.Key.ToLower() == "$exclude").Value, query.FirstOrDefault(t => t.Key.ToLower() == "$where").Value);
294+
return jDB.QueryAsync(string.Join(";", query.Where(t => string.IsNullOrEmpty(t.Value)).Select(t => t.Key).ToList()), query.FirstOrDefault(t => t.Key.ToLower() == "$select").Value, query.FirstOrDefault(t => t.Key.ToLower() == "$exclude").Value, query.FirstOrDefault(t => t.Key.ToLower() == "$where").Value).Result;
295295
}
296296
return null;
297297
}

‎source/jaindb/Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM microsoft/aspnetcore
1+
FROM microsoft/dotnet:2.1-aspnetcore-runtime
22
ARG source
33
WORKDIR /app
44
EXPOSE 5000:5000/tcp
@@ -13,7 +13,7 @@ RUN rm -f -r /app/wwwroot/bin
1313
#RUN apt-get install -y make gcc wget
1414
#RUN apt-get install -y --no-install-recommends ca-certificates
1515
#RUN mkdir -p /app/wwwroot/redis
16-
#RUN wget -O redis.tar.gz http://download.redis.io/releases/redis-4.0.11.tar.gz
16+
#RUN wget -O redis.tar.gz http://download.redis.io/releases/redis-5.0.0.tar.gz
1717
#RUN tar -xzf redis.tar.gz -C /app/wwwroot/redis --strip-components=1
1818

1919
#RUN grep -q '^#define CONFIG_DEFAULT_PROTECTED_MODE 1$' /app/wwwroot/redis/src/server.h
@@ -31,7 +31,7 @@ RUN rm -f -r /app/wwwroot/bin
3131
#RUN cp /app/wwwroot/redis/src/redis-cli /app/wwwroot/bin
3232
#RUN cp /app/wwwroot/redis/src/redis-sentinel /app/wwwroot/bin
3333
#RUN cp /app/wwwroot/redis/src/redis-server /app/wwwroot/bin
34-
#RUN rm -r /app/wwwroot/redis
34+
##RUN rm -r /app/wwwroot/redis
3535

3636

3737
ENV localURL "http://localhost"

‎source/jaindb/JainDB_Logo.ico

113 KB
Binary file not shown.

‎source/jaindb/jaindb.cs

Lines changed: 92 additions & 453 deletions
Large diffs are not rendered by default.

‎source/jaindb/jaindb.csproj

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22

33
<PropertyGroup>
4-
<TargetFramework>netcoreapp2.0</TargetFramework>
4+
<TargetFramework>netcoreapp2.1</TargetFramework>
55
<DockerComposeProjectPath>..\docker-compose.dcproj</DockerComposeProjectPath>
66
<AssemblyName>jaindb</AssemblyName>
77
<SignAssembly>false</SignAssembly>
@@ -12,11 +12,12 @@
1212
<PackageProjectUrl>https://github.com/rzander/jaindb</PackageProjectUrl>
1313
<RepositoryUrl>https://github.com/rzander/jaindb</RepositoryUrl>
1414
<PackageTags>blockchain json</PackageTags>
15-
<Version>1.0.0</Version>
16-
<AssemblyVersion>1.0.0.75</AssemblyVersion>
17-
<FileVersion>1.0.0.75</FileVersion>
18-
<StartupObject>jaindb.Program</StartupObject>
15+
<Version>1.0.1</Version>
16+
<AssemblyVersion>1.0.1.76</AssemblyVersion>
17+
<FileVersion>1.0.1.76</FileVersion>
18+
<StartupObject></StartupObject>
1919
<UserSecretsId>fcfd6c0a-e53c-46cb-8a9d-b786c0579861</UserSecretsId>
20+
<ApplicationIcon>JainDB_Logo.ico</ApplicationIcon>
2021
</PropertyGroup>
2122

2223
<ItemGroup>
@@ -55,21 +56,21 @@
5556

5657
<ItemGroup>
5758
<PackageReference Include="JsonDiffPatch.Net" Version="2.1.0" />
58-
<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.4.1" />
59-
<PackageReference Include="Microsoft.AspNetCore" Version="2.1.3" />
59+
<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.5.1" />
60+
<PackageReference Include="Microsoft.AspNetCore" Version="2.1.4" />
6061
<PackageReference Include="Microsoft.AspNetCore.Authentication" Version="2.1.2" />
61-
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.1.2" />
62+
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.1.3" />
6263
<PackageReference Include="Microsoft.AspNetCore.ResponseCompression" Version="2.1.1" />
6364
<PackageReference Include="Microsoft.AspNetCore.Server.HttpSys" Version="2.1.1" />
6465
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="2.1.1" />
65-
<PackageReference Include="Microsoft.Azure.DocumentDB.Core" Version="2.0.0" />
66+
<PackageReference Include="Microsoft.Azure.DocumentDB.Core" Version="2.1.3" />
6667
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="2.1.1" />
6768
<PackageReference Include="Microsoft.OData.Core" Version="7.5.1" />
6869
<PackageReference Include="Microsoft.VisualStudio.Web.BrowserLink" Version="2.1.1" />
6970
<PackageReference Include="Moon.AspNetCore.Authentication.Basic" Version="4.0.1" />
7071
<PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
7172
<PackageReference Include="RethinkDb.Driver" Version="2.3.23" />
72-
<PackageReference Include="StackExchange.Redis" Version="2.0.505" />
73+
<PackageReference Include="StackExchange.Redis" Version="2.0.513" />
7374
</ItemGroup>
7475

7576
<ItemGroup>

0 commit comments

Comments
 (0)