Skip to content

Commit 8b7df57

Browse files
dotMortendotMorten
authored
Merge pull request #345 from Esri/v100.10
v100.10
2 parents e42f212 + d48c110 commit 8b7df57

33 files changed

Lines changed: 1303 additions & 209 deletions

File tree

‎.github/workflows/CIBuild.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
uses: actions/checkout@v1
2424

2525
- name: Setup Visual Studio Command Prompt
26-
uses: warrenbuckley/Setup-MSBuild@v1
26+
uses: microsoft/setup-msbuild@v1.0.2
2727

2828
- name: Build
2929
run: |

‎build/Signing.targets‎

Lines changed: 3 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
<DownloadNuGet OutputFilename="$(NuGetExePath)" Condition="!Exists('$(NuGetExePath)')" />
4949
</Target>
5050

51-
<UsingTask TaskName="DownloadNuGet" TaskFactory="CodeTaskFactory" AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.v4.0.dll">
51+
<UsingTask TaskName="DownloadNuGet" TaskFactory="CodeTaskFactory" AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.v4.0.dll">
5252
<ParameterGroup>
5353
<OutputFilename ParameterType="System.String" Required="true" />
5454
</ParameterGroup>
@@ -76,43 +76,15 @@
7676
var info = new FileInfo(OutputFilename);
7777
if(!info.Directory.Exists)
7878
info.Directory.Create();
79-
Log.LogMessage("Determining latest version of NuGet.CommandLine...");
8079
WebClient webClient = new WebClient();
81-
XmlDocument xml = new XmlDocument();
82-
xml.LoadXml(webClient.DownloadString("http://nuget.org/v1/FeedService.svc/Packages()?$filter=tolower(Id)%20eq%20'nuget.commandline'&$top=1&$orderby=Version%20desc"));
83-
XmlNamespaceManager xns = new XmlNamespaceManager(xml.NameTable);
84-
xns.AddNamespace("atom", "http://www.w3.org/2005/Atom");
85-
xns.AddNamespace("d", "http://schemas.microsoft.com/ado/2007/08/dataservices");
86-
xns.AddNamespace("m", "http://schemas.microsoft.com/ado/2007/08/dataservices/metadata");
87-
string version = xml.SelectSingleNode("//atom:entry/m:properties/d:Version", xns).InnerText;
88-
string zipUrl = xml.SelectSingleNode("//atom:entry/atom:content", xns).Attributes["src"].Value;
89-
Log.LogMessage("Downloading NuGet.CommandLine v{0}...", version);
90-
zipTempPath = Path.Combine(Path.GetTempPath(), Guid.NewGuid().ToString());
91-
webClient.DownloadFile(zipUrl, zipTempPath);
92-
Log.LogMessage("Copying to {0}...", OutputFilename);
93-
using (Package package = Package.Open(zipTempPath)) {
94-
PackagePart exePart = package.GetParts().Where(p => p.Uri.ToString().ToLowerInvariant() == "/tools/nuget.exe").Single();
95-
using (Stream inputStream = exePart.GetStream(FileMode.Open, FileAccess.Read))
96-
using (Stream outputStream = File.Create(OutputFilename)) {
97-
byte[] buffer = new byte[16384];
98-
while (true) {
99-
int read = inputStream.Read(buffer, 0, buffer.Length);
100-
if (read == 0) {
101-
break;
102-
}
103-
outputStream.Write(buffer, 0, read);
104-
}
105-
}
106-
}
80+
Log.LogMessage("Downloading NuGet.CommandLine");
81+
webClient.DownloadFile("https://dist.nuget.org/win-x86-commandline/v5.7.0/nuget.exe", OutputFilename);
10782
return true;
10883
}
10984
catch (Exception ex) {
11085
Log.LogErrorFromException(ex);
11186
return false;
11287
}
113-
finally {
114-
if (zipTempPath != null) File.Delete(zipTempPath);
115-
}
11688
]]>
11789
</Code>
11890
</Task>

‎src/ARSamples/ARToolkit.SampleApp.Android/ARToolkit.SampleApp.Android.csproj‎

Lines changed: 18 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<AndroidResgenClass>Resource</AndroidResgenClass>
1919
<GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
2020
<AndroidUseLatestPlatformSdk>false</AndroidUseLatestPlatformSdk>
21-
<TargetFrameworkVersion>v8.1</TargetFrameworkVersion>
21+
<TargetFrameworkVersion>v9.0</TargetFrameworkVersion>
2222
<AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest>
2323
<MonoAndroidResourcePrefix>Resources</MonoAndroidResourcePrefix>
2424
<MonoAndroidAssetsPrefix>Assets</MonoAndroidAssetsPrefix>
@@ -142,12 +142,6 @@
142142
<SubType>Designer</SubType>
143143
</AndroidResource>
144144
</ItemGroup>
145-
<ItemGroup>
146-
<ProjectReference Include="..\..\ARToolkit\Esri.ArcGISRuntime.ARToolkit.csproj">
147-
<Project>{168467dc-6d2d-477a-9ac2-f1486fa67e0a}</Project>
148-
<Name>Esri.ArcGISRuntime.ARToolkit</Name>
149-
</ProjectReference>
150-
</ItemGroup>
151145
<ItemGroup>
152146
<AndroidResource Include="Resources\layout\fullscalear.axml">
153147
<Generator>MSBuild:UpdateGeneratedFiles</Generator>
@@ -168,11 +162,21 @@
168162
</ItemGroup>
169163
<Import Project="..\SampleHelpers\SampleHelpers.projitems" Label="Shared" />
170164
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
171-
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
172-
Other similar extension points exist, see Microsoft.Common.targets.
173-
<Target Name="BeforeBuild">
174-
</Target>
175-
<Target Name="AfterBuild">
176-
</Target>
177-
-->
165+
<Choose>
166+
<When Condition="'$(UseNugetPackage)'==''">
167+
<ItemGroup>
168+
<ProjectReference Include="..\..\ARToolkit\Esri.ArcGISRuntime.ARToolkit.csproj">
169+
<Project>{168467dc-6d2d-477a-9ac2-f1486fa67e0a}</Project>
170+
<Name>Esri.ArcGISRuntime.ARToolkit</Name>
171+
</ProjectReference>
172+
</ItemGroup>
173+
</When>
174+
<Otherwise>
175+
<ItemGroup>
176+
<PackageReference Include="Esri.ArcGISRuntime.ARToolkit">
177+
<Version>$(UseNugetPackage)</Version>
178+
</PackageReference>
179+
</ItemGroup>
180+
</Otherwise>
181+
</Choose>
178182
</Project>

‎src/ARSamples/ARToolkit.SampleApp.UWP/ARToolkit.SampleApp.UWP.csproj‎

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -168,12 +168,23 @@
168168
<Version>3.1.1</Version>
169169
</PackageReference>
170170
</ItemGroup>
171-
<ItemGroup>
172-
<ProjectReference Include="..\..\ARToolkit\Esri.ArcGISRuntime.ARToolkit.csproj">
173-
<Project>{190a1f64-46a7-44b5-806f-d9633fa94783}</Project>
174-
<Name>Esri.ArcGISRuntime.ARToolkit</Name>
175-
</ProjectReference>
176-
</ItemGroup>
171+
<Choose>
172+
<When Condition="'$(UseNugetPackage)'==''">
173+
<ItemGroup>
174+
<ProjectReference Include="..\..\ARToolkit\Esri.ArcGISRuntime.ARToolkit.csproj">
175+
<Project>{190a1f64-46a7-44b5-806f-d9633fa94783}</Project>
176+
<Name>Esri.ArcGISRuntime.ARToolkit</Name>
177+
</ProjectReference>
178+
</ItemGroup>
179+
</When>
180+
<Otherwise>
181+
<ItemGroup>
182+
<PackageReference Include="Esri.ArcGISRuntime.ARToolkit">
183+
<Version>$(UseNugetPackage)</Version>
184+
</PackageReference>
185+
</ItemGroup>
186+
</Otherwise>
187+
</Choose>
177188
<Import Project="..\SampleHelpers\SampleHelpers.projitems" Label="Shared" />
178189
<PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '14.0' ">
179190
<VisualStudioVersion>14.0</VisualStudioVersion>

‎src/ARSamples/ARToolkit.SampleApp.iOS/ARToolkit.SampleApp.iOS.csproj‎

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -175,12 +175,23 @@
175175
<Visible>false</Visible>
176176
</ImageAsset>
177177
</ItemGroup>
178-
<ItemGroup>
179-
<ProjectReference Include="..\..\ARToolkit\Esri.ArcGISRuntime.ARToolkit.csproj">
180-
<Project>{190a1f64-46a7-44b5-806f-d9633fa94783}</Project>
181-
<Name>Esri.ArcGISRuntime.ARToolkit</Name>
182-
</ProjectReference>
183-
</ItemGroup>
178+
<Choose>
179+
<When Condition="'$(UseNugetPackage)'==''">
180+
<ItemGroup>
181+
<ProjectReference Include="..\..\ARToolkit\Esri.ArcGISRuntime.ARToolkit.csproj">
182+
<Project>{190a1f64-46a7-44b5-806f-d9633fa94783}</Project>
183+
<Name>Esri.ArcGISRuntime.ARToolkit</Name>
184+
</ProjectReference>
185+
</ItemGroup>
186+
</When>
187+
<Otherwise>
188+
<ItemGroup>
189+
<PackageReference Include="Esri.ArcGISRuntime.ARToolkit">
190+
<Version>$(UseNugetPackage)</Version>
191+
</PackageReference>
192+
</ItemGroup>
193+
</Otherwise>
194+
</Choose>
184195
<Import Project="..\SampleHelpers\SampleHelpers.projitems" Label="Shared" />
185196
<Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
186197
</Project>

‎src/ARSamples/ARToolkit.Samples.Forms.Android/ARToolkit.Samples.Forms.Android.csproj‎

Lines changed: 25 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -105,18 +105,34 @@
105105
<Folder Include="Resources\drawable\" />
106106
</ItemGroup>
107107
<ItemGroup>
108-
<ProjectReference Include="..\..\ARToolkit.Forms\Esri.ArcGISRuntime.ARToolkit.Forms.csproj">
109-
<Project>{43c278cb-f076-4519-b916-c267c15927a6}</Project>
110-
<Name>Esri.ArcGISRuntime.ARToolkit.Forms</Name>
111-
</ProjectReference>
112-
<ProjectReference Include="..\..\ARToolkit\Esri.ArcGISRuntime.ARToolkit.csproj">
113-
<Project>{190a1f64-46a7-44b5-806f-d9633fa94783}</Project>
114-
<Name>Esri.ArcGISRuntime.ARToolkit</Name>
115-
</ProjectReference>
116108
<ProjectReference Include="..\ARToolkit.Samples.Forms\ARToolkit.Samples.Forms.csproj">
117109
<Project>{3b4245f2-c20b-4dfb-87b5-1aec123be464}</Project>
118110
<Name>ARToolkit.Samples.Forms</Name>
119111
</ProjectReference>
120112
</ItemGroup>
121-
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
113+
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
114+
<Choose>
115+
<When Condition="'$(UseNugetPackage)'==''">
116+
<ItemGroup>
117+
<ProjectReference Include="..\..\ARToolkit.Forms\Esri.ArcGISRuntime.ARToolkit.Forms.csproj">
118+
<Project>{43c278cb-f076-4519-b916-c267c15927a6}</Project>
119+
<Name>Esri.ArcGISRuntime.ARToolkit.Forms</Name>
120+
</ProjectReference>
121+
<ProjectReference Include="..\..\ARToolkit\Esri.ArcGISRuntime.ARToolkit.csproj">
122+
<Project>{190a1f64-46a7-44b5-806f-d9633fa94783}</Project>
123+
<Name>Esri.ArcGISRuntime.ARToolkit</Name>
124+
</ProjectReference>
125+
</ItemGroup>
126+
</When>
127+
<Otherwise>
128+
<ItemGroup>
129+
<PackageReference Include="Esri.ArcGISRuntime.ARToolkit.Forms">
130+
<Version>$(UseNugetPackage)</Version>
131+
</PackageReference>
132+
<PackageReference Include="Esri.ArcGISRuntime.ARToolkit">
133+
<Version>$(UseNugetPackage)</Version>
134+
</PackageReference>
135+
</ItemGroup>
136+
</Otherwise>
137+
</Choose>
122138
</Project>

‎src/ARSamples/ARToolkit.Samples.Forms.UWP/ARToolkit.Samples.Forms.UWP.csproj‎

Lines changed: 24 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -148,15 +148,31 @@
148148
</PackageReference>
149149
<PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform" Version="6.2.8" />
150150
</ItemGroup>
151+
<Choose>
152+
<When Condition="'$(UseNugetPackage)'==''">
153+
<ItemGroup>
154+
<ProjectReference Include="..\..\ARToolkit.Forms\Esri.ArcGISRuntime.ARToolkit.Forms.csproj">
155+
<Project>{9cb71063-b6a7-4bca-b740-6eb9d3b4ece9}</Project>
156+
<Name>Esri.ArcGISRuntime.ARToolkit.Forms</Name>
157+
</ProjectReference>
158+
<ProjectReference Include="..\..\ARToolkit\Esri.ArcGISRuntime.ARToolkit.csproj">
159+
<Project>{168467dc-6d2d-477a-9ac2-f1486fa67e0a}</Project>
160+
<Name>Esri.ArcGISRuntime.ARToolkit</Name>
161+
</ProjectReference>
162+
</ItemGroup>
163+
</When>
164+
<Otherwise>
165+
<ItemGroup>
166+
<PackageReference Include="Esri.ArcGISRuntime.ARToolkit.Forms">
167+
<Version>$(UseNugetPackage)</Version>
168+
</PackageReference>
169+
<PackageReference Include="Esri.ArcGISRuntime.ARToolkit">
170+
<Version>$(UseNugetPackage)</Version>
171+
</PackageReference>
172+
</ItemGroup>
173+
</Otherwise>
174+
</Choose>
151175
<ItemGroup>
152-
<ProjectReference Include="..\..\ARToolkit.Forms\Esri.ArcGISRuntime.ARToolkit.Forms.csproj">
153-
<Project>{9cb71063-b6a7-4bca-b740-6eb9d3b4ece9}</Project>
154-
<Name>Esri.ArcGISRuntime.ARToolkit.Forms</Name>
155-
</ProjectReference>
156-
<ProjectReference Include="..\..\ARToolkit\Esri.ArcGISRuntime.ARToolkit.csproj">
157-
<Project>{168467dc-6d2d-477a-9ac2-f1486fa67e0a}</Project>
158-
<Name>Esri.ArcGISRuntime.ARToolkit</Name>
159-
</ProjectReference>
160176
<ProjectReference Include="..\ARToolkit.Samples.Forms\ARToolkit.Samples.Forms.csproj">
161177
<Project>{3b4245f2-c20b-4dfb-87b5-1aec123be464}</Project>
162178
<Name>ARToolkit.Samples.Forms</Name>

‎src/ARSamples/ARToolkit.Samples.Forms.iOS/ARToolkit.Samples.Forms.iOS.csproj‎

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -164,11 +164,24 @@
164164
</PackageReference>
165165
</ItemGroup>
166166
<Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
167+
<Choose>
168+
<When Condition="'$(UseNugetPackage)'==''">
169+
<ItemGroup>
170+
<ProjectReference Include="..\..\ARToolkit.Forms\Esri.ArcGISRuntime.ARToolkit.Forms.csproj">
171+
<Project>{9cb71063-b6a7-4bca-b740-6eb9d3b4ece9}</Project>
172+
<Name>Esri.ArcGISRuntime.ARToolkit.Forms</Name>
173+
</ProjectReference>
174+
</ItemGroup>
175+
</When>
176+
<Otherwise>
177+
<ItemGroup>
178+
<PackageReference Include="Esri.ArcGISRuntime.ARToolkit.Forms">
179+
<Version>$(UseNugetPackage)</Version>
180+
</PackageReference>
181+
</ItemGroup>
182+
</Otherwise>
183+
</Choose>
167184
<ItemGroup>
168-
<ProjectReference Include="..\..\ARToolkit.Forms\Esri.ArcGISRuntime.ARToolkit.Forms.csproj">
169-
<Project>{9cb71063-b6a7-4bca-b740-6eb9d3b4ece9}</Project>
170-
<Name>Esri.ArcGISRuntime.ARToolkit.Forms</Name>
171-
</ProjectReference>
172185
<ProjectReference Include="..\ARToolkit.Samples.Forms\ARToolkit.Samples.Forms.csproj">
173186
<Project>{3b4245f2-c20b-4dfb-87b5-1aec123be464}</Project>
174187
<Name>ARToolkit.Samples.Forms</Name>

‎src/ARSamples/ARToolkit.Samples.Forms/ARToolkit.Samples.Forms.csproj‎

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,22 @@
1313
<Version>$(XamarinFormsPackageVersion)</Version>
1414
</PackageReference>
1515
<PackageReference Include="Xam.Plugins.Settings" Version="3.1.1" />
16-
<ProjectReference Include="..\..\ARToolkit.Forms\Esri.ArcGISRuntime.ARToolkit.Forms.csproj" />
1716
</ItemGroup>
17+
18+
<Choose>
19+
<When Condition="'$(UseNugetPackage)'==''">
20+
<ItemGroup>
21+
<ProjectReference Include="..\..\ARToolkit.Forms\Esri.ArcGISRuntime.ARToolkit.Forms.csproj" />
22+
</ItemGroup>
23+
</When>
24+
<Otherwise>
25+
<ItemGroup>
26+
<PackageReference Include="Esri.ArcGISRuntime.ARToolkit.Forms">
27+
<Version>$(UseNugetPackage)</Version>
28+
</PackageReference>
29+
</ItemGroup>
30+
</Otherwise>
31+
</Choose>
1832

1933
<ItemGroup>
2034
<Compile Update="Samples\LookAroundSample.xaml.cs">

‎src/ARToolkit.Forms/ARSceneView.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -324,7 +324,7 @@ internal static float SystemPixelToDipsFactor
324324
return 1f;
325325
}
326326

327-
_windowManager.DefaultDisplay.GetMetrics(displayMetrics);
327+
_windowManager.DefaultDisplay?.GetMetrics(displayMetrics);
328328
return displayMetrics?.Density ?? 1f;
329329
}
330330
}

0 commit comments

Comments
 (0)