diff --git a/.gitignore b/.gitignore index 1088272d..2dee4d6a 100644 --- a/.gitignore +++ b/.gitignore @@ -292,4 +292,5 @@ Generated Files/ src/GraphControl/GraphingImplOverrides.props !/build/config/TRexDefs/** !src/Calculator/TemporaryKey.pfx -!src/CalculatorUnitTests/CalculatorUnitTests_TemporaryKey.pfx \ No newline at end of file +!src/CalculatorUnitTests/CalculatorUnitTests_TemporaryKey.pfx +*.binlog diff --git a/.vsts-ci.Linux.yml b/.vsts-ci.Linux.yml index 2563255e..9f6ffa2a 100644 --- a/.vsts-ci.Linux.yml +++ b/.vsts-ci.Linux.yml @@ -13,9 +13,9 @@ jobs: clean: true - bash: | - sudo chmod -R 777 /emsdk cd /emsdk - sudo ./emsdk activate sdk-1.38.28-64bit + sudo ./emsdk activate sdk-1.38.31-64bit + sudo chmod -R 777 /emsdk displayName: 'Setup Emscripten' @@ -37,7 +37,8 @@ jobs: - script: | source /emsdk/emsdk_env.sh cd $(build.sourcesdirectory) - msbuild /r /p:Configuration=Release "/p:PackageVersion=$(GITVERSION_FullSemVer)" /p:MixedModeBuild=$(MixedModeBuild) $(build.sourcesdirectory)/src/Calculator.Wasm/Calculator.Wasm.csproj + msbuild /r /p:BuildPlatformTarget=Wasm $(build.sourcesdirectory)/src/build/build.csproj + msbuild /r /p:Configuration=Release $(build.sourcesdirectory)/src/Calculator.Wasm/Calculator.Wasm.csproj env: GITVERSION_FullSemVer: $(GITVERSION_FullSemVer) diff --git a/.vsts-ci.Windows.yml b/.vsts-ci.Windows.yml index 0bb13cc3..6eaab640 100644 --- a/.vsts-ci.Windows.yml +++ b/.vsts-ci.Windows.yml @@ -14,13 +14,26 @@ jobs: versionSpec: 4.9.1 checkLatest: false + - task: MSBuild@1 + inputs: + solution: src/build/build.csproj + msbuildLocationMethod: version + msbuildVersion: latest + msbuildArchitecture: x86 + msbuildArguments: /r /p:Configuration=Release /detailedsummary + clean: false + maximumCpuCount: true + restoreNugetPackages: false + logProjectEvents: false + createLogFile: false + - task: MSBuild@1 inputs: solution: src/Calculator.sln msbuildLocationMethod: version msbuildVersion: latest msbuildArchitecture: x86 - msbuildArguments: /r /p:Configuration=Release "/p:PackageVersion=%GITVERSION_FullSemVer%" "/p:InformationalVersion=%GITVERSION_InformationalVersion%" /detailedsummary + msbuildArguments: /r /p:Configuration=Release /detailedsummary clean: false maximumCpuCount: true restoreNugetPackages: false diff --git a/.vsts-ci.iOS.yml b/.vsts-ci.iOS.yml index 51f6d4aa..b00fc1ee 100644 --- a/.vsts-ci.iOS.yml +++ b/.vsts-ci.iOS.yml @@ -45,13 +45,26 @@ jobs: displayName: Build native CalcManager + - task: MSBuild@1 + inputs: + solution: '$(build.sourcesdirectory)/src/build/build.csproj' + msbuildLocationMethod: version + msbuildVersion: latest + msbuildArchitecture: x86 + msbuildArguments: /r /p:BuildPlatformTarget=iOS /bl:$(build.artifactstagingdirectory)/build.binlog + clean: false + maximumCpuCount: true + restoreNugetPackages: false + logProjectEvents: true + createLogFile: true + - task: MSBuild@1 inputs: solution: '$(build.sourcesdirectory)/src/Calculator.iOS/Calculator.iOS.csproj' msbuildLocationMethod: version msbuildVersion: latest msbuildArchitecture: x86 - msbuildArguments: /r /p:Configuration=Release /p:Platform=iPhone /detailedsummary /m:16 /nr:false "/p:InformationalVersion=%GITVERSION_InformationalVersion%" + msbuildArguments: /r /p:Configuration=Release /p:Platform=iPhone /bl:$(build.artifactstagingdirectory)/build.binlog clean: false maximumCpuCount: true restoreNugetPackages: false @@ -69,6 +82,7 @@ jobs: flattenFolders: false - task: PublishBuildArtifacts@1 + condition: always() inputs: PathtoPublish: $(build.artifactstagingdirectory) ArtifactName: Uno-Calculator-iOS diff --git a/.vsts-ci.yml b/.vsts-ci.yml index 32caa33e..bb8c9c12 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -1,7 +1,7 @@ resources: containers: - container: nv-bionic-wasm - image: nventive/wasm-build:1.2 + image: nventive/wasm-build:1.3 jobs: - template: .vsts-ci.Windows.yml diff --git a/src/AssemblyVersion.Android.cs b/src/AssemblyVersion.Android.cs new file mode 100644 index 00000000..33e7d5f9 --- /dev/null +++ b/src/AssemblyVersion.Android.cs @@ -0,0 +1,17 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Runtime Version:4.0.30319.42000 +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +[assembly: System.Reflection.AssemblyVersion("1.0.0.0")] +[assembly: System.Reflection.AssemblyFileVersion("270")] +[assembly: System.Reflection.AssemblyProduct("AppVersion for Android")] +[assembly: System.Reflection.AssemblyInformationalVersion("1.0.0.0")] +[assembly: System.Reflection.AssemblyCopyright("Copyright (C) 2019")] + + diff --git a/src/AssemblyVersion.Uwp.cs b/src/AssemblyVersion.Uwp.cs new file mode 100644 index 00000000..e19a7671 --- /dev/null +++ b/src/AssemblyVersion.Uwp.cs @@ -0,0 +1,17 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Runtime Version:4.0.30319.42000 +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +[assembly: System.Reflection.AssemblyVersion("1.0.0.0")] +[assembly: System.Reflection.AssemblyFileVersion("270")] +[assembly: System.Reflection.AssemblyProduct("AppVersion for Windows")] +[assembly: System.Reflection.AssemblyInformationalVersion("1.0.0.0")] +[assembly: System.Reflection.AssemblyCopyright("Copyright (C) 2019")] + + diff --git a/src/AssemblyVersion.Wasm.cs b/src/AssemblyVersion.Wasm.cs new file mode 100644 index 00000000..7664052c --- /dev/null +++ b/src/AssemblyVersion.Wasm.cs @@ -0,0 +1,17 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Runtime Version:4.0.30319.42000 +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +[assembly: System.Reflection.AssemblyVersion("1.0.0.0")] +[assembly: System.Reflection.AssemblyFileVersion("270")] +[assembly: System.Reflection.AssemblyProduct("AppVersion for Windows Phone")] +[assembly: System.Reflection.AssemblyInformationalVersion("1.0.0.0")] +[assembly: System.Reflection.AssemblyCopyright("Copyright (C) 2019")] + + diff --git a/src/AssemblyVersion.iOS.cs b/src/AssemblyVersion.iOS.cs new file mode 100644 index 00000000..3cdcb52a --- /dev/null +++ b/src/AssemblyVersion.iOS.cs @@ -0,0 +1,17 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Runtime Version:4.0.30319.42000 +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +[assembly: System.Reflection.AssemblyVersion("1.0.0.0")] +[assembly: System.Reflection.AssemblyFileVersion("270")] +[assembly: System.Reflection.AssemblyProduct("AppVersion for iOS")] +[assembly: System.Reflection.AssemblyInformationalVersion("1.0.0.0")] +[assembly: System.Reflection.AssemblyCopyright("Copyright (C) 2019")] + + diff --git a/src/CalcManager/build_ios.sh b/src/CalcManager/build_ios.sh index 889f516f..520defd7 100755 --- a/src/CalcManager/build_ios.sh +++ b/src/CalcManager/build_ios.sh @@ -15,7 +15,7 @@ mkdir bin/arm64 libtool \ -static \ *.o \ - -o bin/arm64/libCalcManager.a + -o ../Calculator.iOS/NativeReferences/arm64/libCalcManager.a rm *.o @@ -32,7 +32,7 @@ mkdir bin/x86_64 libtool \ -static \ *.o \ - -o bin/x86_64/libCalcManager.a + -o ../Calculator.iOS/NativeReferences/x86_64/libCalcManager.a rm *.o diff --git a/src/Calculator.Droid/Calculator.Droid.csproj b/src/Calculator.Droid/Calculator.Droid.csproj index b9661773..0cd4104c 100644 --- a/src/Calculator.Droid/Calculator.Droid.csproj +++ b/src/Calculator.Droid/Calculator.Droid.csproj @@ -58,6 +58,9 @@ + + Properties\AssemblyVersion.Android.cs + @@ -88,4 +91,4 @@ --> - \ No newline at end of file + diff --git a/src/Calculator.Droid/Properties/AssemblyInfo.cs b/src/Calculator.Droid/Properties/AssemblyInfo.cs index d1561776..361c2a5e 100644 --- a/src/Calculator.Droid/Properties/AssemblyInfo.cs +++ b/src/Calculator.Droid/Properties/AssemblyInfo.cs @@ -10,21 +10,6 @@ using Android.App; [assembly: AssemblyDescription("")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("UnoQuickStart.Droid")] -[assembly: AssemblyCopyright("Copyright © 2016")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] [assembly: ComVisible(false)] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/src/Calculator.UWP/Calculator.UWP.csproj b/src/Calculator.UWP/Calculator.UWP.csproj index a4588f04..39820a2a 100644 --- a/src/Calculator.UWP/Calculator.UWP.csproj +++ b/src/Calculator.UWP/Calculator.UWP.csproj @@ -9,7 +9,7 @@ 4.3.1 - 1.45.0-dev.1457 + 1.45.0-dev.1503 @@ -103,6 +103,9 @@ + + Properties\AssemblyVersion.Uwp.cs + @@ -127,4 +130,4 @@ --> - \ No newline at end of file + diff --git a/src/Calculator.UWP/Properties/AssemblyInfo.cs b/src/Calculator.UWP/Properties/AssemblyInfo.cs index 1e69d08e..a17f239f 100644 --- a/src/Calculator.UWP/Properties/AssemblyInfo.cs +++ b/src/Calculator.UWP/Properties/AssemblyInfo.cs @@ -9,21 +9,7 @@ using System.Runtime.InteropServices; [assembly: AssemblyDescription("")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("UnoQuickStart")] -[assembly: AssemblyCopyright("Copyright © 2016")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] -[assembly: ComVisible(false)] \ No newline at end of file +[assembly: ComVisible(false)] diff --git a/src/Calculator.Wasm/Calculator.Wasm.csproj b/src/Calculator.Wasm/Calculator.Wasm.csproj index cf7e9eef..081d9448 100644 --- a/src/Calculator.Wasm/Calculator.Wasm.csproj +++ b/src/Calculator.Wasm/Calculator.Wasm.csproj @@ -1,50 +1,47 @@  - - Exe - netstandard2.0 - true - $(DefineConstants);__WASM__ - NU1701 - false - + + Exe + netstandard2.0 + true + $(DefineConstants);__WASM__ + NU1701 + false true + FullAOT release-dynamic - - - C:\Users\jerome.laban\Downloads\mono-wasm-527abcd1152.zip - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + diff --git a/src/Calculator.Wasm/LinkerConfig.xml b/src/Calculator.Wasm/LinkerConfig.xml index 03f69ba0..3a70ea83 100644 --- a/src/Calculator.Wasm/LinkerConfig.xml +++ b/src/Calculator.Wasm/LinkerConfig.xml @@ -1,9 +1,3 @@ - - - - - - diff --git a/src/Calculator.iOS/Calculator.iOS.csproj b/src/Calculator.iOS/Calculator.iOS.csproj index 57c94e53..f70d3edb 100644 --- a/src/Calculator.iOS/Calculator.iOS.csproj +++ b/src/Calculator.iOS/Calculator.iOS.csproj @@ -114,6 +114,9 @@ + + Properties\AssemblyVersion.iOS.cs + false @@ -172,6 +175,8 @@ false + + @@ -183,18 +188,18 @@ - + - + Static - + Static - \ No newline at end of file + diff --git a/src/Calculator.iOS/Native References/arm64/libCalcManager.a b/src/Calculator.iOS/Native References/arm64/libCalcManager.a deleted file mode 100644 index 14802ec1..00000000 Binary files a/src/Calculator.iOS/Native References/arm64/libCalcManager.a and /dev/null differ diff --git a/src/Calculator.iOS/Native References/x86_64/libCalcManager.a b/src/Calculator.iOS/Native References/x86_64/libCalcManager.a deleted file mode 100644 index 0cb8d3fe..00000000 Binary files a/src/Calculator.iOS/Native References/x86_64/libCalcManager.a and /dev/null differ diff --git a/src/Calculator.iOS/NativeReferences/arm64/libCalcManager.a b/src/Calculator.iOS/NativeReferences/arm64/libCalcManager.a new file mode 100644 index 00000000..d26810d8 Binary files /dev/null and b/src/Calculator.iOS/NativeReferences/arm64/libCalcManager.a differ diff --git a/src/Calculator.iOS/NativeReferences/x86_64/libCalcManager.a b/src/Calculator.iOS/NativeReferences/x86_64/libCalcManager.a new file mode 100644 index 00000000..dac4d11a Binary files /dev/null and b/src/Calculator.iOS/NativeReferences/x86_64/libCalcManager.a differ diff --git a/src/Calculator.iOS/Properties/AssemblyInfo.cs b/src/Calculator.iOS/Properties/AssemblyInfo.cs index eceb25c0..9bcc596e 100644 --- a/src/Calculator.iOS/Properties/AssemblyInfo.cs +++ b/src/Calculator.iOS/Properties/AssemblyInfo.cs @@ -5,12 +5,10 @@ using System.Runtime.InteropServices; // General Information about an assembly is controlled through the following // set of attributes. Change these attribute values to modify the information // associated with an assembly. -[assembly: AssemblyTitle("UnoQuickStart.iOS")] +[assembly: AssemblyTitle("Uno Calculator")] [assembly: AssemblyDescription("")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("UnoQuickStart.iOS")] -[assembly: AssemblyCopyright("Copyright © 2016")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] @@ -21,16 +19,3 @@ using System.Runtime.InteropServices; // The following GUID is for the ID of the typelib if this project is exposed to COM [assembly: Guid("166de4ca-8f11-4ef9-bcf8-3e7834988e7d")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/src/build/build.csproj b/src/build/build.csproj new file mode 100644 index 00000000..c680c913 --- /dev/null +++ b/src/build/build.csproj @@ -0,0 +1,237 @@ + + + + netstandard2.0 + true + false + + Calculator + true + + + + + + + + + + + + + + + + + + + + + + + <_BuildNumber>$(PackageBuildNumber) + <_BuildNumber Condition="'$(BUILD_REPOSITORY_PROVIDER)' == 'TfsVersionControl'">$(BUILD_SOURCEVERSION.Substring(1)) + + + + + + + + + + <_BuildNumber Condition="$(BuildNumberOffset) != ''">$([MSBuild]::Add($(_BuildNumber), $(BuildNumberOffset))) + <_InformationalVersion>$(PackageInformationalVersion) + <_InformationalVersion Condition="'$(_InformationalVersion)' == ''">$(GITVERSION_InformationalVersion) + <_AppVersion>$(PackageVersion) + <_AppVersion Condition="'$(_AppVersion)'==''">$(GitVersion_MajorMinorPatch) + + + + + + + <_AppVersion>$(GitVersion_Major).$(GitVersion_Minor).$(_BuildNumber) + + + + + <_AppVersion Condition="$(_AppVersion.Split('.').length) == 1">$(_AppVersion).0.0 + <_AppVersion Condition="$(_AppVersion.Split('.').length) == 2">$(_AppVersion).0 + + + + + 0 + <_AppVersion>$(_AppVersion).$(AppRevision) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ; + + Console.WriteLine("Updating " + items.Count() + " nodes"); + + foreach (var item in items.ToArray()) + { + var attr = item as System.Xml.Linq.XAttribute; + if (attr != null) + { + attr.SetValue(Value); + } + + var ele = item as System.Xml.Linq.XElement; + if (ele != null) + { + ele.SetValue(Value); + } + } + + xdoc.Save(XmlFileName); + ]]> + + + + + + + <_SourceBasePath>../$(AppName) + <_ManifestPath>$(_SourceBasePath).Android/Properties/AndroidManifest.xml + <_PlistFilePath>$(_SourceBasePath).Android/Info.plist + <_AppxManifestPath>$(_SourceBasePath).Android/Package.appxmanifest + <_AndroidNamespace> + + + <_WindowsNamespace> + + + + + + + + + + + + <_XmlUpdate Condition="Exists('$(_PlistFilePath)')" + XmlFileName="$(_PlistFilePath)" + XPath="//plist/dict/key[text() = 'CFBundleShortVersionString']/following-sibling::string[1]" + Value="$(PackageVersion)" /> + + <_XmlUpdate Condition="Exists('$(_PlistFilePath)')" + XmlFileName="$(_PlistFilePath)" + XPath="//plist/dict/key[text() = 'CFBundleVersion']/following-sibling::string[1]" + Value="$(PackageBuildNumber)" /> + + + + <_Major Include="$(PackageVersion.Split('.')[0])" /> + <_Minor Include="$(PackageVersion.Split('.')[1])" /> + <_Revision Include="$(PackageVersion.Split('.')[3])" /> + + + + + + <_UWPVersion>@(_Major).@(_Minor).$(PackageBuildNumber).@(_Revision) + + + + + + +