Skip to content
Snippets Groups Projects
Commit df76e96f authored by Patrik Paško's avatar Patrik Paško
Browse files

Merge branch 'develop' into 'master'

Nuget merge

See merge request digital-twin/twinzo/tdevkit!19
parents 5e63f143 e63be98f
No related merge requests found
...@@ -15,6 +15,8 @@ build: ...@@ -15,6 +15,8 @@ build:
test: test:
stage: test stage: test
tags:
- net5
script: script:
- dotnet test - dotnet test
......
using Flurl; using SDK.Models;
using SDK.Models;
using System; using System;
using System.Threading.Tasks; using System.Threading.Tasks;
......
using Flurl; 
using SDK.Contracts.Data; using SDK.Contracts.Data;
using SDK.Models; using SDK.Models;
using System.Threading.Tasks; using System.Threading.Tasks;
...@@ -36,17 +36,15 @@ namespace SDK ...@@ -36,17 +36,15 @@ namespace SDK
return await response.Content.ReadAsByteArrayAsync(); return await response.Content.ReadAsByteArrayAsync();
} }
public async Task<string> GetUnityLastVersion(string platform) public async Task<string> GetUnityLastVersion(string platform) {
string subUrl = Address.UrlCombine(Address.UtilsUnityLastVersion, platform); string subUrl = Address.UrlCombine(Address.UtilsUnityLastVersion, platform);
string subUrl = Address.UtilsUnityLastVersion + platform;
var response = await GetRequest<string>(subUrl); var response = await GetRequest<string>(subUrl);
return response; return response;
} }
public async Task<FileInfoContract> GetUnityBundleInfo(string bundleName) public async Task<FileInfoContract> GetUnityBundleInfo(string bundleName) {
string subUrl = Address.UrlCombine(Address.UtilsUnityBundleInfo, bundleName); string subUrl = Address.UrlCombine(Address.UtilsUnityBundleInfo, bundleName);
string subUrl = Address.UtilsUnityBundleInfo + bundleName;
var response = await GetRequest<FileInfoContract>(subUrl); var response = await GetRequest<FileInfoContract>(subUrl);
return response; return response;
......
...@@ -15,5 +15,6 @@ ...@@ -15,5 +15,6 @@
public long Timestamp { get; set; } public long Timestamp { get; set; }
public int Index { get; set; } public int Index { get; set; }
} }
} }
...@@ -196,6 +196,7 @@ namespace Main ...@@ -196,6 +196,7 @@ namespace Main
DataType = "Int32", DataType = "Int32",
Unit = "unit" Unit = "unit"
}; };
var sensorDataContracts = new[] {data1, data2, data3 };
SensorContract sensor = new SensorContract SensorContract sensor = new SensorContract
{ {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment