Skip to content

Commit

Permalink
Merge pull request #1600 from specklesystems/release/2.8
Browse files Browse the repository at this point in the history
[Release] 2.8 Features
  • Loading branch information
AlanRynne authored Sep 8, 2022
2 parents fa655fd + 02d7032 commit b95647e
Show file tree
Hide file tree
Showing 295 changed files with 8,359 additions and 4,224 deletions.
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
- run: git branch internal_circleci
- path-filtering/set-parameters:
mapping: |
Core/.* run_core true
Core/.* core true
(Core|Objects|ConnectorRhino|ConnectorGrasshopper|.*/ConverterRhinoGh)/.* rhino true
(Core|Objects|ConnectorRevit|.*/ConverterRevit)/.* revit true
(Core|Objects|ConnectorDynamo|.*/ConverterDynamo)/.* dynamo true
Expand Down
32 changes: 22 additions & 10 deletions .circleci/scripts/config-template.yml
Original file line number Diff line number Diff line change
Expand Up @@ -128,17 +128,26 @@ jobs: # Each project will have individual jobs for each specific task it has to
if(-Not [string]::IsNullOrEmpty($env:CIRCLE_TAG) -And -Not $semver.Contains('-')) { New-Item -Force "speckle-sharp-ci-tools/Installers/<< parameters.slug >>/latest.yml" -ItemType File -Value "version: $semver" }
environment:
WORKFLOW_NUM: << pipeline.number >>

- run: # Creates the inno installer
- run:
name: Build Installer
command: speckle-sharp-ci-tools\InnoSetup\ISCC.exe speckle-sharp-ci-tools\%SLUG%.iss /Sbyparam=$p
shell: cmd.exe #does not work in powershell
environment:
SLUG: << parameters.slug >>
- persist_to_workspace:
root: ./
paths:
- speckle-sharp-ci-tools/Installers
- when:
condition:
equal: [teklastructures, << parameters.slug >>] # Tekla Structures has it's own "plugin packager", so we do this instead of the ISS step
steps:
- run:
name: Build TSEP
command: speckle-sharp-ci-tools/TSEPBuilder/TeklaExtensionPackage.BatchBuilder.exe -I C:/Users/circleci/project/ConnectorTeklaStructures/ConnectorTeklaStructures2021/ManifestGenerator.xml -O C:/Users/circleci/project/speckle-sharp-ci-tools/Installers/<<parameters.slug>>/<<parameters.dllname>>.tsep
- when:
condition: << pipeline.git.tag >>
steps:
- persist_to_workspace:
root: ./
paths:
- speckle-sharp-ci-tools/Installers

deploy-connector-new:
docker:
Expand Down Expand Up @@ -246,10 +255,13 @@ jobs: # Each project will have individual jobs for each specific task it has to
TAG=$(if [ "${CIRCLE_TAG}" ]; then echo $CIRCLE_TAG; else echo "0.0.0"; fi;)
SEMVER=$(echo "$TAG" | sed -e 's/\/[a-zA-Z-]*//')
cp speckle-sharp-ci-tools/Mac/<<parameters.installername>>/bin/Release/netcoreapp3.1/osx-x64/<<parameters.slug>>.zip speckle-sharp-ci-tools/Installers/<< parameters.slug >>/<<parameters.slug>>-$SEMVER.zip
- persist_to_workspace:
root: ./
paths:
- speckle-sharp-ci-tools/Installers
- when:
condition: << pipeline.git.tag >>
steps:
- persist_to_workspace:
root: ./
paths:
- speckle-sharp-ci-tools/Installers

get-ci-tools: # Clones our ci tools and persists them to the workspace
docker:
Expand Down
1 change: 0 additions & 1 deletion .circleci/scripts/connector-jobs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,6 @@ teklastructures:
slug: teklastructures
requires:
- build-desktopui

csi:
- build-connector:
slnname: ConnectorCSI
Expand Down
File renamed without changes.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
*.user
*.userosscache
*.sln.docstates
*.tsep

# Intellij Crap
.idea
Expand Down
57 changes: 53 additions & 4 deletions All.sln
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConnectorDynamoExtension",
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConnectorDynamoFunctions", "ConnectorDynamo\ConnectorDynamoFunctions\ConnectorDynamoFunctions.csproj", "{8F4D907B-A2DF-4B40-8EA6-D79F9ED6D906}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConnectorGrasshopper", "ConnectorGrasshopper\ConnectorGrasshopper\ConnectorGrasshopper.csproj", "{109B3382-634B-408A-8A5C-4CD09CB92641}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConnectorGrasshopper", "ConnectorGrasshopper\ConnectorGrasshopper\ConnectorGrasshopper.csproj", "{109B3382-634B-408A-8A5C-4CD09CB92641}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DesktopUI", "DesktopUI\DesktopUI\DesktopUI.csproj", "{A97C3046-2D55-4C49-AB40-A3C2194B82FA}"
EndProject
Expand All @@ -31,7 +31,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Objects", "Objects", "{E391
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Converters", "Converters", "{4DE5ED81-2A55-4C23-A05F-3C9B9B06F85D}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ConnectorRevit", "ConnectorRevit", "{42A86931-7497-4A34-B2FD-060231CD0A8F}"
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Revit", "Revit", "{42A86931-7497-4A34-B2FD-060231CD0A8F}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConnectorRevit2021", "ConnectorRevit\ConnectorRevit2021\ConnectorRevit2021.csproj", "{27A79ACA-7EA8-4406-8BB8-216578CC3AB7}"
EndProject
Expand Down Expand Up @@ -191,6 +191,16 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConnectorAutocad2023", "Con
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConnectorCivil2023", "ConnectorAutocadCivil\ConnectorCivil2023\ConnectorCivil2023.csproj", "{2639E37D-80D3-415A-B4D1-20D7F321F27F}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "DesktopUI", "DesktopUI", "{59764E6A-8366-4AF3-AB0A-BA28BD0318FA}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DesktopUI2.Launcher", "DesktopUI2\DesktopUI2.Launcher\DesktopUI2.Launcher.csproj", "{BDBB6B68-1DF8-4C41-B4AD-55037F81543D}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DesktopUI2.WPF", "DesktopUI2\DesktopUI2.WPF\DesktopUI2.WPF.csproj", "{3D066801-9823-48ED-8FB3-273B53825808}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConverterDxf", "Objects\Converters\ConverterDxf\ConverterDxf\ConverterDxf.csproj", "{B5A7A2E9-B46A-44FC-9D6F-42BE2773C51F}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AvaloniaHwndHost", "DesktopUI2\AvaloniaHwndHost\AvaloniaHwndHost.csproj", "{050E8BAB-773E-4FE6-BD38-F71CF65FC257}"
EndProject
Global
GlobalSection(SharedMSBuildProjectFiles) = preSolution
Objects\Converters\ConverterTeklaStructures\ConverterTeklaStructuresShared\ConverterTeklaStructuresShared.projitems*{02a24dd8-e0ca-4657-baa7-b033a4563709}*SharedItemsImports = 5
Expand All @@ -199,6 +209,7 @@ Global
Objects\Converters\ConverterCSI\ConverterCSIShared\ConverterCSIShared.projitems*{21223ba5-c6e8-405d-b581-106c4726edc0}*SharedItemsImports = 5
ConnectorCSI\ConnectorCSIShared\ConnectorCSIShared.projitems*{23be6e54-96c1-4373-89f3-e18a1c9807fd}*SharedItemsImports = 4
Objects\Converters\ConverterCSI\ConverterCSIShared\ConverterCSIShared.projitems*{23be6e54-96c1-4373-89f3-e18a1c9807fd}*SharedItemsImports = 4
ConnectorAutocadCivil\ConnectorAutocadCivil\ConnectorAutocadCivilShared.projitems*{2639e37d-80d3-415a-b4d1-20d7f321f27f}*SharedItemsImports = 4
Objects\Converters\ConverterRhinoGh\ConverterRhinoGhShared\ConverterRhinoGhShared.projitems*{26eca1be-f5b2-4a41-9658-46a4a917bfe6}*SharedItemsImports = 5
ConnectorRevit\ConnectorRevit\ConnectorRevit.projitems*{27a79aca-7ea8-4406-8bb8-216578cc3ab7}*SharedItemsImports = 4
ConnectorTeklaStructures\ConnectorTeklaStructuresShared\ConnectorTeklaStructuresShared.projitems*{28e2ea7f-ffd1-4e13-9165-0243b5ac82f5}*SharedItemsImports = 13
Expand Down Expand Up @@ -254,6 +265,7 @@ Global
Objects\Converters\ConverterAutocadCivil\ConverterAutocadCivilShared\ConverterAutocadCivilShared.projitems*{d9f443b5-c55b-4ad8-9c70-bc3d2be781be}*SharedItemsImports = 5
ConnectorRevit\ConnectorRevit\ConnectorRevit.projitems*{dfdfdbb8-018b-4dcb-a012-54227abf53a7}*SharedItemsImports = 4
ConnectorRevit\ConnectorRevit\ConnectorRevit.projitems*{ef418256-8118-47b4-8386-a945946fb92d}*SharedItemsImports = 4
ConnectorAutocadCivil\ConnectorAutocadCivil\ConnectorAutocadCivilShared.projitems*{f4bfb155-7ba9-4e46-8240-9c825060c904}*SharedItemsImports = 4
ConnectorMicroStation\ConnectorMicroStationOpenShared\ConnectorMicroStationOpenShared.projitems*{fc044d89-0ff3-441d-b35d-87454a693c16}*SharedItemsImports = 4
ConnectorAutocadCivil\ConnectorAutocadCivil\ConnectorAutocadCivilShared.projitems*{ff1793e1-77f5-4a92-b3f2-6d8b104e479b}*SharedItemsImports = 4
Objects\Converters\ConverterMicroStation\ConverterMicroStationOpenShared\ConverterMicroStationOpenShared.projitems*{ffbc46f0-1874-42e9-8270-bbf962ef32d1}*SharedItemsImports = 5
Expand Down Expand Up @@ -745,6 +757,38 @@ Global
{2639E37D-80D3-415A-B4D1-20D7F321F27F}.Release|Any CPU.Build.0 = Release|Any CPU
{2639E37D-80D3-415A-B4D1-20D7F321F27F}.Release|x64.ActiveCfg = Release|Any CPU
{2639E37D-80D3-415A-B4D1-20D7F321F27F}.Release|x64.Build.0 = Release|Any CPU
{BDBB6B68-1DF8-4C41-B4AD-55037F81543D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{BDBB6B68-1DF8-4C41-B4AD-55037F81543D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{BDBB6B68-1DF8-4C41-B4AD-55037F81543D}.Debug|x64.ActiveCfg = Debug|Any CPU
{BDBB6B68-1DF8-4C41-B4AD-55037F81543D}.Debug|x64.Build.0 = Debug|Any CPU
{BDBB6B68-1DF8-4C41-B4AD-55037F81543D}.Release|Any CPU.ActiveCfg = Release|Any CPU
{BDBB6B68-1DF8-4C41-B4AD-55037F81543D}.Release|Any CPU.Build.0 = Release|Any CPU
{BDBB6B68-1DF8-4C41-B4AD-55037F81543D}.Release|x64.ActiveCfg = Release|Any CPU
{BDBB6B68-1DF8-4C41-B4AD-55037F81543D}.Release|x64.Build.0 = Release|Any CPU
{3D066801-9823-48ED-8FB3-273B53825808}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{3D066801-9823-48ED-8FB3-273B53825808}.Debug|Any CPU.Build.0 = Debug|Any CPU
{3D066801-9823-48ED-8FB3-273B53825808}.Debug|x64.ActiveCfg = Debug|Any CPU
{3D066801-9823-48ED-8FB3-273B53825808}.Debug|x64.Build.0 = Debug|Any CPU
{3D066801-9823-48ED-8FB3-273B53825808}.Release|Any CPU.ActiveCfg = Release|Any CPU
{3D066801-9823-48ED-8FB3-273B53825808}.Release|Any CPU.Build.0 = Release|Any CPU
{3D066801-9823-48ED-8FB3-273B53825808}.Release|x64.ActiveCfg = Release|Any CPU
{3D066801-9823-48ED-8FB3-273B53825808}.Release|x64.Build.0 = Release|Any CPU
{B5A7A2E9-B46A-44FC-9D6F-42BE2773C51F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{B5A7A2E9-B46A-44FC-9D6F-42BE2773C51F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B5A7A2E9-B46A-44FC-9D6F-42BE2773C51F}.Debug|x64.ActiveCfg = Debug|Any CPU
{B5A7A2E9-B46A-44FC-9D6F-42BE2773C51F}.Debug|x64.Build.0 = Debug|Any CPU
{B5A7A2E9-B46A-44FC-9D6F-42BE2773C51F}.Release|Any CPU.ActiveCfg = Release|Any CPU
{B5A7A2E9-B46A-44FC-9D6F-42BE2773C51F}.Release|Any CPU.Build.0 = Release|Any CPU
{B5A7A2E9-B46A-44FC-9D6F-42BE2773C51F}.Release|x64.ActiveCfg = Release|Any CPU
{B5A7A2E9-B46A-44FC-9D6F-42BE2773C51F}.Release|x64.Build.0 = Release|Any CPU
{050E8BAB-773E-4FE6-BD38-F71CF65FC257}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{050E8BAB-773E-4FE6-BD38-F71CF65FC257}.Debug|Any CPU.Build.0 = Debug|Any CPU
{050E8BAB-773E-4FE6-BD38-F71CF65FC257}.Debug|x64.ActiveCfg = Debug|Any CPU
{050E8BAB-773E-4FE6-BD38-F71CF65FC257}.Debug|x64.Build.0 = Debug|Any CPU
{050E8BAB-773E-4FE6-BD38-F71CF65FC257}.Release|Any CPU.ActiveCfg = Release|Any CPU
{050E8BAB-773E-4FE6-BD38-F71CF65FC257}.Release|Any CPU.Build.0 = Release|Any CPU
{050E8BAB-773E-4FE6-BD38-F71CF65FC257}.Release|x64.ActiveCfg = Release|Any CPU
{050E8BAB-773E-4FE6-BD38-F71CF65FC257}.Release|x64.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand All @@ -755,7 +799,7 @@ Global
{B494FD40-5E59-4D5E-87B0-80AAC8BDCD5A} = {CB6F8F77-4487-469B-896A-1EEEC4451A04}
{8F4D907B-A2DF-4B40-8EA6-D79F9ED6D906} = {CB6F8F77-4487-469B-896A-1EEEC4451A04}
{109B3382-634B-408A-8A5C-4CD09CB92641} = {9461B162-AD2F-4F60-BCE4-E72DCEFD4608}
{A97C3046-2D55-4C49-AB40-A3C2194B82FA} = {DD7DA7E3-FBB7-4216-852B-A4A5BF3AB9AB}
{A97C3046-2D55-4C49-AB40-A3C2194B82FA} = {59764E6A-8366-4AF3-AB0A-BA28BD0318FA}
{60BE029E-1F31-4473-8B68-A745A43AF179} = {E3916A0F-68D5-4C84-ACAE-41547F75E454}
{8BBED205-C34E-4226-8757-0B576132D2BC} = {DC6BE73D-4D60-4F90-9778-D44151CD6F98}
{8FA5494A-D651-4C80-9B69-EB1808CF64F8} = {DC6BE73D-4D60-4F90-9778-D44151CD6F98}
Expand Down Expand Up @@ -795,7 +839,7 @@ Global
{B7376EC8-5D3E-47D2-96A7-748552F14C39} = {E94E7327-5A9B-48EE-93CC-E9E9A5B980F1}
{6185B1A1-0A12-44B1-8AC5-0ED48147FB21} = {85C30B55-E486-49AE-B3F5-6A196D14CCB8}
{85C30B55-E486-49AE-B3F5-6A196D14CCB8} = {4DE5ED81-2A55-4C23-A05F-3C9B9B06F85D}
{AC0613B5-BD0E-4DA3-B704-7BE70D17AFFE} = {DD7DA7E3-FBB7-4216-852B-A4A5BF3AB9AB}
{AC0613B5-BD0E-4DA3-B704-7BE70D17AFFE} = {59764E6A-8366-4AF3-AB0A-BA28BD0318FA}
{0DA15CBF-A6C5-4EEC-BDDE-9FA403E20A17} = {DD7DA7E3-FBB7-4216-852B-A4A5BF3AB9AB}
{0420D74A-2997-4B92-844B-C3769DEAA1AD} = {0DA15CBF-A6C5-4EEC-BDDE-9FA403E20A17}
{372D9F0F-EDE9-4050-BF8C-758911C5C2E0} = {0DA15CBF-A6C5-4EEC-BDDE-9FA403E20A17}
Expand Down Expand Up @@ -840,6 +884,11 @@ Global
{D163D710-B946-4D50-8833-BD8B9941033A} = {DF1B3505-793C-4073-975B-04C81CC3CDC4}
{F4BFB155-7BA9-4E46-8240-9C825060C904} = {890F3257-FCC2-4ED8-9180-22B3641B494C}
{2639E37D-80D3-415A-B4D1-20D7F321F27F} = {890F3257-FCC2-4ED8-9180-22B3641B494C}
{59764E6A-8366-4AF3-AB0A-BA28BD0318FA} = {DD7DA7E3-FBB7-4216-852B-A4A5BF3AB9AB}
{BDBB6B68-1DF8-4C41-B4AD-55037F81543D} = {59764E6A-8366-4AF3-AB0A-BA28BD0318FA}
{3D066801-9823-48ED-8FB3-273B53825808} = {59764E6A-8366-4AF3-AB0A-BA28BD0318FA}
{B5A7A2E9-B46A-44FC-9D6F-42BE2773C51F} = {925C0BF6-A0B1-4699-9C4B-078E01D652CC}
{050E8BAB-773E-4FE6-BD38-F71CF65FC257} = {59764E6A-8366-4AF3-AB0A-BA28BD0318FA}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {1D43D91B-4F01-4A78-8250-CC6F9BD93A14}
Expand Down
32 changes: 27 additions & 5 deletions ConnectorArchicad/ConnectorArchicad/ConnectorBinding.cs
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
using DesktopUI2.Models.Filters;
using DesktopUI2.Models.Settings;
using DesktopUI2.ViewModels;
using static DesktopUI2.ViewModels.MappingViewModel;
using Speckle.Core.Api;
using Speckle.Core.Credentials;
using Speckle.Core.Kits;
Expand Down Expand Up @@ -87,32 +88,47 @@ public override List<StreamState> GetStreamsInFile()
return new List<StreamState>();
}

public override void ResetDocument()
{
// TODO!
}

public override List<ReceiveMode> GetReceiveModes()
{
return new List<ReceiveMode> { ReceiveMode.Create };
}

public override bool CanPreviewReceive => false;
public override Task<StreamState> PreviewReceive(StreamState state, ProgressViewModel progress)
{
return null;
}

public override async Task<StreamState> ReceiveStream(StreamState state, ProgressViewModel progress)
{
Base commitObject = await Helpers.Receive(IdentifyStream(state));
if (commitObject is null)
{
return null;
}

state.SelectedObjectIds = await ElementConverterManager.Instance.ConvertToNative(commitObject, progress.CancellationTokenSource.Token);

return state;
}

public override void SelectClientObjects(string args) { }
public override void SelectClientObjects(List<string> args, bool deselect = false)
{
// TODO!
}

public override bool CanPreviewSend => false;
public override void PreviewSend(StreamState state, ProgressViewModel progress)
{
return;
}
public override async Task<string> SendStream(StreamState state, ProgressViewModel progress)
{
if (state.Filter is null)
{
return null;
}

state.SelectedObjectIds = state.Filter.Selection;

Expand All @@ -132,5 +148,11 @@ private static string IdentifyStream(StreamState state)
var stream = new StreamWrapper { StreamId = state.StreamId, ServerUrl = state.ServerUrl, BranchName = state.BranchName, CommitId = state.CommitId != "latest" ? state.CommitId : null };
return stream.ToString();
}

public override async Task<Dictionary<string, List<MappingValue>>> ImportFamilyCommand(Dictionary<string, List<MappingValue>> Mapping)
{
await Task.Delay(TimeSpan.FromMilliseconds(500));
return new Dictionary<string, List<MappingValue>>();
}
}
}
6 changes: 3 additions & 3 deletions ConnectorArchicad/ConnectorArchicad/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ class Program
public static Window? MainWindow { get; private set; }
public static ArchicadBinding? Bindings { get; set; }

public static void Main(string[ ] args)
public static void Main(string[] args)
{
if (args.Length == 0)
{
Expand All @@ -35,7 +35,7 @@ public static void Main(string[ ] args)
// BuildAvaloniaApp().StartWithClassicDesktopLifetime(args, Avalonia.Controls.ShutdownMode.OnMainWindowClose);
}

public static void CreateOrFocusSpeckle(string[ ] args)
public static void CreateOrFocusSpeckle(string[] args)
{
if (MainWindow == null)
BuildAvaloniaApp().Start(AppMain, args);
Expand All @@ -54,7 +54,7 @@ public static AppBuilder BuildAvaloniaApp() => AppBuilder.Configure<DesktopUI2.A
.LogToTrace()
.UseReactiveUI();

private static void AppMain(Application app, string[ ] args)
private static void AppMain(Application app, string[] args)
{
var viewModel = new MainViewModel(Bindings);
MainWindow = new MainWindow { DataContext = viewModel };
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -66,13 +66,13 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Avalonia">
<Version>0.10.16</Version>
<Version>0.10.18</Version>
</PackageReference>
<PackageReference Include="Avalonia.Desktop">
<Version>0.10.16</Version>
<Version>0.10.18</Version>
</PackageReference>
<PackageReference Include="Avalonia.ReactiveUI">
<Version>0.10.16</Version>
<Version>0.10.18</Version>
</PackageReference>
<PackageReference Include="MSBuild.AssemblyVersion">
<Version>1.3.0</Version>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using System.Reflection;
using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;

Expand Down Expand Up @@ -32,6 +32,6 @@
// 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("2.0.0.0")]
[assembly: AssemblyFileVersion("2.0.0.0")]
[assembly: AssemblyInformationalVersion("2.0.0-beta")]
[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]
[assembly: AssemblyInformationalVersion("1.0.0.0")]
Original file line number Diff line number Diff line change
Expand Up @@ -56,13 +56,13 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Avalonia">
<Version>0.10.16</Version>
<Version>0.10.18</Version>
</PackageReference>
<PackageReference Include="Avalonia.Desktop">
<Version>0.10.16</Version>
<Version>0.10.18</Version>
</PackageReference>
<PackageReference Include="Avalonia.ReactiveUI">
<Version>0.10.16</Version>
<Version>0.10.18</Version>
</PackageReference>
<PackageReference Include="MSBuild.AssemblyVersion">
<Version>1.3.0</Version>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,4 +34,4 @@
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]
[assembly: AssemblyInformationalVersion("2.0.0-beta")]
[assembly: AssemblyInformationalVersion("1.0.0.0")]
Original file line number Diff line number Diff line change
Expand Up @@ -57,13 +57,13 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Avalonia">
<Version>0.10.16</Version>
<Version>0.10.18</Version>
</PackageReference>
<PackageReference Include="Avalonia.Desktop">
<Version>0.10.16</Version>
<Version>0.10.18</Version>
</PackageReference>
<PackageReference Include="Avalonia.ReactiveUI">
<Version>0.10.16</Version>
<Version>0.10.18</Version>
</PackageReference>
<PackageReference Include="MSBuild.AssemblyVersion">
<Version>1.3.0</Version>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using System.Reflection;
using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;

Expand Down
Loading

0 comments on commit b95647e

Please sign in to comment.