Minor updates to the readme and license files. SDK is now only covered by the Tobii SDLA

added signing och the nuget package

Author: jonashogstrom

.github/workflows/build.yml

@@ -24,7 +24,8 @@ jobs:
     - name: Setup .NET Core
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 5.0.100
+        dotnet-version: '6.0.x'
+        include-prerelease: true
     - name: Install dependencies
       run: dotnet restore
     - name: Build debug
@@ -42,13 +43,40 @@ jobs:
         recursive: true
 
     - name: Build nuget package
-      run: dotnet pack --configuration Release /p:Version=${{steps.version.outputs.version}} 
+      run: dotnet pack --no-build --configuration Release /p:Version=${{steps.version.outputs.version}} 
+
+ 
+# https://timheuer.com/blog/use-nuget-with-github-actions-github-packages/
+#    - name: Setup NuGet
+#      uses: NuGet/setup-nuget@v1.0.2
+#      with:
+#        nuget-api-key: ${{ secrets.G3SDKNUGETAPIKEY }}
+#        nuget-version: latest
+
+    - name: Get certificate
+      id: cert_file
+      uses: timheuer/base64-to-file@master
+      with:
+        fileName: 'certfile.pfx'
+        encodedString: ${{ secrets.TOBIICODESIGNCERTIFICATE_B64 }}
+
+# Sign the package
+#    - name: Setup nuget
+#      uses: nuget/setup-nuget@v1
+#      with:
+#        nuget-api-key: ${{ secrets.G3SDKNUGETAPIKEY }}
+#        nuget-version: '5.x'
+
+    - name: Sign NuGet Package
+      run: dotnet nuget sign "source\bin\Release\Tobii.Glasses3.SDK.${{steps.version.outputs.version}}.nupkg" --certificate-path "${{steps.cert_file.outputs.filePath}}" --certificate-password "${{secrets.CODESIGNPASSWORD}}" --timestamper http://timestamp.digicert.com --verbosity detailed
+#      run: tools\nuget.exe sign "source\bin\Release\Tobii.Glasses3.SDK.${{steps.version.outputs.version}}.nupkg" -Timestamper http://timestamp.digicert.com –NonInteractive -Verbosity detailed
 
     - name: Upload nuget package
       uses: actions/upload-artifact@v2
       with:
         name: Tobii.Glasses3.SDK_${{steps.version.outputs.version}}
         path: source/bin/Release/Tobii.Glasses3.SDK.*.nupkg
+
     - name: Upload signed SDK dlls, .net4
       uses: actions/upload-artifact@v2
       with:

G3SDK.sln

@@ -12,9 +12,11 @@ EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{3220B0DB-E356-42BA-9024-54E73E0D037C}"
 	ProjectSection(SolutionItems) = preProject
 		.github\workflows\build.yml = .github\workflows\build.yml
-		LICENSE.txt = LICENSE.txt
 		README.md = README.md
 		Readme.txt = Readme.txt
+		SDLA\Tobii Pro SDLA for Research Use.html = SDLA\Tobii Pro SDLA for Research Use.html
+		SDLA\Tobii Pro SDLA for Research Use.md = SDLA\Tobii Pro SDLA for Research Use.md
+		SDLA\Tobii Pro SDLA for Research Use.pdf = SDLA\Tobii Pro SDLA for Research Use.pdf
 	EndProjectSection
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "G3LSLConnector", "examples\G3LSLConnector\G3LSLConnector.csproj", "{956CB83E-BE81-4CDA-AA6B-4A1A7915666E}"
@@ -25,7 +27,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "G3Demo", "examples\G3Demo\G
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "G3ToScreenMapper", "examples\G3ToScreenMapper\G3ToScreenMapper.csproj", "{C84B11C9-C2BE-441E-BB85-F1B775F30DE7}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "G3Simulator", "G3Simulator\G3Simulator.csproj", "{B79D2615-80D1-4E59-8E78-0229532743C7}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "G3Simulator", "G3Simulator\G3Simulator.csproj", "{B79D2615-80D1-4E59-8E78-0229532743C7}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

G3Simulator/G3Simulator.cs

@@ -68,7 +68,6 @@ public Uri LiveRtspUri(bool gazeOverlay = false)
     public class UpgradeSimulator : IUpgrade
     {
         private readonly G3Simulator _g3Simulator;
-        private bool _inProgress;
 
         public UpgradeSimulator(G3Simulator g3Simulator)
         {
@@ -79,7 +78,7 @@ public UpgradeSimulator(G3Simulator g3Simulator)
 
         public IG3Observable<bool> Completed { get; }
         public IG3Observable<UpgradeState> Progress { get; }
-        public Task<bool> InProgress => Task.FromResult(_inProgress);
+        public Task<bool> InProgress => Task.FromResult(false);
     }
 
     public class WebRTCSimulator : IWebRTC
@@ -210,7 +209,7 @@ public class RudimentarySimulator : IRudimentary
         private G3ImuData _lastImu;
         private G3Event _lastEvent;
         private G3SyncPortData _lastSyncPort;
-        private int _sceneQuality;
+        private int _sceneQuality = 25;
         private readonly SignalSimulator<byte[]> _sceneSig = new SignalSimulator<byte[]>();
         private readonly SignalSimulator<G3SyncPortData> _syncPortSig = new SignalSimulator<G3SyncPortData>();
         private readonly SignalSimulator<G3ImuData> _imuSig = new SignalSimulator<G3ImuData>();

LICENSE.txt

@@ -1,9 +1,8 @@
 # Tobii Pro Glasses 3 SDK for .net ![example workflow](https://github.com/tobiipro/G3SDK.net/actions/workflows/build.yml/badge.svg)
 
 ## License
-The source code for this SDK and its examples is licensed under a permissive MIT license, but the 
-[Tobii Software Development License Agreement](SDLA/licenseagreement.html) is still in effect when 
-it comes to developing software for the Glasses3 API.
+The source code for this SDK and its examples is licensed under the 
+[Tobii Software Development License Agreement](SDLA/licenseagreement.html).
 
 ## Installation 
 
@@ -15,7 +14,7 @@ You can install using NuGet like this:
 nuget install Tobii.Glasses3.SDK.net
 ```
 
-Or select it from the NuGet packages UI on Visual Studio.
+Or select it from the NuGet packages UI in Visual Studio.
 
 On Visual Studio, make sure that you are targeting atleast either .netframework 4.7.2 or .net5, as this package uses some features of newer .NETs.  
 
@@ -53,7 +52,7 @@ The SDK does not support streaming data via WebRTC or RTSP on its own, you will
 ### Glasses Demo
 Demo that shows 
 * How to find glasses
-* Show live view (using RTSP) with synchronized local gaze overlay
+* Show live view (using RTSP via the FFME.Windows package) with synchronized local gaze overlay
 * Start/stop recordings
 * Calibrate glasses
 * Change settings