Skip to content
This repository has been archived by the owner on Dec 12, 2024. It is now read-only.

Bump .NET version to 7.0 #807

Merged
merged 30 commits into from
Jan 29, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
482c5bf
Updated projects, removed MonoPInvokeCallback
stephen-hawley Dec 6, 2023
7076692
remove ios cruft
stephen-hawley Dec 6, 2023
4f19295
remove nint/IntPtr conflicts
stephen-hawley Dec 6, 2023
df4240c
dependency issues
stephen-hawley Dec 7, 2023
bdb3129
rebuild macOS runtime library
stephen-hawley Dec 7, 2023
8bd8643
rebuild ios runtime project
stephen-hawley Dec 11, 2023
0312bb2
type-o-matic changes
stephen-hawley Dec 11, 2023
c5e534d
update solution
stephen-hawley Dec 12, 2023
8b5e496
incorrectly linked file
stephen-hawley Dec 12, 2023
6e5acf2
fix tests
stephen-hawley Dec 12, 2023
31c8f28
get tests to run - not pass - run
stephen-hawley Dec 19, 2023
e2bfc9d
changes to make unit tests run
stephen-hawley Jan 8, 2024
ebece01
changed protocol vtable implementation to use delegate *unmanaged<>
stephen-hawley Jan 10, 2024
65c20df
protocol type change
stephen-hawley Jan 10, 2024
085434e
protocol list fixes
stephen-hawley Jan 10, 2024
e966721
more protocol list types
stephen-hawley Jan 10, 2024
d2bd0e3
nint/nuint IntPtr UIntPtr aliasing
stephen-hawley Jan 10, 2024
41f893e
closure handlind
stephen-hawley Jan 11, 2024
237b2b9
fixed flow control issue with type codes for IntPtr and UIntPtr, ensu…
stephen-hawley Jan 11, 2024
245c2ee
exception text changed
stephen-hawley Jan 11, 2024
302be41
restore MakeDelegateFromBlindClosure
stephen-hawley Jan 12, 2024
54ec94d
clean up test running code for nullability
stephen-hawley Jan 22, 2024
2e3f312
get that comment committed, thanks.
stephen-hawley Jan 22, 2024
9f0c2a7
remove default elements
stephen-hawley Jan 23, 2024
16646d3
factor out common properties, remove defaults
stephen-hawley Jan 23, 2024
ccb5f15
removing defaults etc
stephen-hawley Jan 23, 2024
e46ed01
clean up swiftreflector csproj
stephen-hawley Jan 23, 2024
db6c826
minor updates
stephen-hawley Jan 23, 2024
42aa91e
removed redundant property group item
stephen-hawley Jan 23, 2024
16f90dd
remove dead makefile rule, cleanup up csproj files
stephen-hawley Jan 23, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
122 changes: 31 additions & 91 deletions DylibBinder/DylibBinder.csproj
Original file line number Diff line number Diff line change
@@ -1,92 +1,32 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">x86</Platform>
<ProjectGuid>{2BB83AA6-D9DB-432F-8FC1-7AC83E7FE97B}</ProjectGuid>
<OutputType>Exe</OutputType>
<RootNamespace>DylibBinder</RootNamespace>
<AssemblyName>DylibBinder</AssemblyName>
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug</OutputPath>
<DefineConstants>DEBUG;</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<ExternalConsole>true</ExternalConsole>
<PlatformTarget>x64</PlatformTarget>
<LangVersion>latest</LangVersion>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
<Optimize>true</Optimize>
<OutputPath>bin\Release</OutputPath>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<ExternalConsole>true</ExternalConsole>
<PlatformTarget>x86</PlatformTarget>
<LangVersion>latest</LangVersion>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="Mono.Options">
<HintPath>..\packages\Mono.Options.6.6.0.161\lib\net40\Mono.Options.dll</HintPath>
</Reference>
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Xml" />
<Reference Include="mscorlib" />
</ItemGroup>
<ItemGroup>
<Compile Include="Program.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="CheckInventory.cs" />
<Compile Include="DylibBinderOptions.cs" />
<Compile Include="InnerX.cs" />
<Compile Include="StringExtensions.cs" />
<Compile Include="DBTopLevel.cs" />
<Compile Include="DBTypeDeclaration.cs" />
<Compile Include="DBFunc.cs" />
<Compile Include="DBProperty.cs" />
<Compile Include="DBParameter.cs" />
<Compile Include="DBGenericParameter.cs" />
<Compile Include="DBAssociatedType.cs" />
<Compile Include="SwiftTypeToString.cs" />
<Compile Include="DBInnerTypes.cs" />
<Compile Include="XmlGenerator.cs" />
<Compile Include="Enums.cs" />
<Compile Include="SortedSetExtensions.cs" />
<Compile Include="DylibBinderReflector.cs" />
<Compile Include="DBModule.cs" />
</ItemGroup>
<ItemGroup>
<None Include="README.md" />
<None Include="packages.config" />
<None Include="Makefile" />
<None Include="IgnoreList.txt" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Dynamo\Dynamo.csproj">
<Project>{D0E2964B-34C9-4FEE-A638-A10E2E4A0917}</Project>
<Name>Dynamo</Name>
</ProjectReference>
<ProjectReference Include="..\SwiftReflector\SwiftReflector.csproj">
<Project>{65E8BE11-4D82-4EA5-9D14-3CA044D443EF}</Project>
<Name>SwiftReflector</Name>
</ProjectReference>
<ProjectReference Include="..\SwiftRuntimeLibrary\SwiftRuntimeLibrary.csproj">
<Project>{B7E6CF5A-B836-41CF-988C-A83607AF5445}</Project>
<Name>SwiftRuntimeLibrary</Name>
</ProjectReference>
<ProjectReference Include="..\tom-swifty\tom-swifty.csproj">
<Project>{8CAC7366-9650-440D-A3C5-36D880285DD5}</Project>
<Name>tom-swifty</Name>
</ProjectReference>
</ItemGroup>
<PropertyGroup>
<LangVersion>latest</LangVersion>
</PropertyGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Move the "net7.0" to a variable defined in a root Directory.Build.props Then use that variable to set the TargetFramework in every project. i.e:
<TargetFramework>$(DOTNET_TFM)</TargetFramework>
or
<TargetFramework>$(DOTNET_TFM)-ios</TargetFramework>

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is big enough that I feel it should be its own issue: #809

<Platform Condition=" '$(Platform)' == '' ">x86</Platform>
<OutputType>Exe</OutputType>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These PropertyGroups contain some default settings and duplicate settings,
remove the defaults and move the duplicated settings to a new PropertyGroup

<OutputPath>bin\Debug</OutputPath>
<DefineConstants>DEBUG;</DefineConstants>
<ExternalConsole>true</ExternalConsole>
<PlatformTarget>x64</PlatformTarget>
<LangVersion>latest</LangVersion>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
<OutputPath>bin\Release</OutputPath>
<ExternalConsole>true</ExternalConsole>
<LangVersion>latest</LangVersion>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\Dynamo\Dynamo.csproj" />
<ProjectReference Include="..\SwiftReflector\SwiftReflector.csproj" />
<ProjectReference Include="..\SwiftRuntimeLibrary\SwiftRuntimeLibrary.csproj" />
<ProjectReference Include="..\tom-swifty\tom-swifty.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Mono.Options" Version="6.6.0.161" />
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Use Central Package Management to keep all the package versions in sync: https://learn.microsoft.com/en-us/nuget/consume-packages/Central-Package-Management

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Opened an issue for this.

</ItemGroup>
<PropertyGroup>
<LangVersion>latest</LangVersion>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This setting is duplicated in the two condition PropertyGroups above, remove the prior ones.

</PropertyGroup>
</Project>
4 changes: 0 additions & 4 deletions DylibBinder/packages.config

This file was deleted.

175 changes: 19 additions & 156 deletions Dynamo/Dynamo.csproj
Original file line number Diff line number Diff line change
@@ -1,157 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{D0E2964B-34C9-4FEE-A638-A10E2E4A0917}</ProjectGuid>
<OutputType>Library</OutputType>
<RootNamespace>Dynamo</RootNamespace>
<AssemblyName>Dynamo</AssemblyName>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug</OutputPath>
<DefineConstants>DEBUG;</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<ConsolePause>false</ConsolePause>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>full</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release</OutputPath>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<ConsolePause>false</ConsolePause>
</PropertyGroup>
<ItemGroup>
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="ICodeElement.cs" />
<Compile Include="ICodeWriter.cs" />
<Compile Include="WriteEventArgs.cs" />
<Compile Include="ICodeElementSet.cs" />
<Compile Include="CodeWriter.cs" />
<Compile Include="Exceptions.cs" />
<Compile Include="Extensions.cs" />
<Compile Include="CodeElementCollection.cs" />
<Compile Include="DecoratedCodeElementCollection.cs" />
<Compile Include="SimpleLineElement.cs" />
<Compile Include="SimpleElement.cs" />
<Compile Include="LabeledCodeElementCollection.cs" />
<Compile Include="CommaListElementCollection.cs" />
<Compile Include="DelegatedSimpleElement.cs" />
<Compile Include="Dynamo.CSLang\CSUsing.cs" />
<Compile Include="Dynamo.CSLang\CSComment.cs" />
<Compile Include="Dynamo.CSLang\ICSTopLevelDeclaration.cs" />
<Compile Include="Dynamo.CSLang\CSNamespace.cs" />
<Compile Include="Dynamo.CSLang\Enums.cs" />
<Compile Include="Dynamo.CSLang\CSFile.cs" />
<Compile Include="Dynamo.CSLang\CSType.cs" />
<Compile Include="Dynamo.CSLang\CSIdentifier.cs" />
<Compile Include="Dynamo.CSLang\ICSExpression.cs" />
<Compile Include="Dynamo.CSLang\CSBinaryExpression.cs" />
<Compile Include="Dynamo.CSLang\CSBaseExpression.cs" />
<Compile Include="Dynamo.CSLang\CSFunctionCall.cs" />
<Compile Include="Dynamo.CSLang\CSConstant.cs" />
<Compile Include="Dynamo.CSLang\CSAssignment.cs" />
<Compile Include="Dynamo.CSLang\CSLine.cs" />
<Compile Include="Dynamo.CSLang\ICSLineable.cs" />
<Compile Include="Dynamo.CSLang\CSIfElse.cs" />
<Compile Include="Dynamo.CSLang\CSMethod.cs" />
<Compile Include="Dynamo.CSLang\CSParameter.cs" />
<Compile Include="Dynamo.CSLang\CSCodeBlock.cs" />
<Compile Include="Dynamo.CSLang\ICSStatement.cs" />
<Compile Include="LineCodeElementCollection.cs" />
<Compile Include="Dynamo.CSLang\CSArgument.cs" />
<Compile Include="Dynamo.CSLang\CSAttribute.cs" />
<Compile Include="Dynamo.CSLang\CSProperty.cs" />
<Compile Include="Dynamo.CSLang\CSReturn.cs" />
<Compile Include="Dynamo.CSLang\CSBinding.cs" />
<Compile Include="Dynamo.CSLang\CSFieldDeclaration.cs" />
<Compile Include="Dynamo.CSLang\CSParenthesisExpression.cs" />
<Compile Include="Dynamo.CSLang\CSFileBasic.cs" />
<Compile Include="Dynamo.SwiftLang\Enums.cs" />
<Compile Include="Dynamo.SwiftLang\SLType.cs" />
<Compile Include="Dynamo.SwiftLang\ISLExpr.cs" />
<Compile Include="Dynamo.SwiftLang\SLBaseExpr.cs" />
<Compile Include="Dynamo.SwiftLang\SLBinaryExpr.cs" />
<Compile Include="Dynamo.SwiftLang\SLIdentifier.cs" />
<Compile Include="Dynamo.SwiftLang\SLBinding.cs" />
<Compile Include="Dynamo.SwiftLang\SLNameTypePair.cs" />
<Compile Include="Dynamo.SwiftLang\SLReturn.cs" />
<Compile Include="Dynamo.SwiftLang\SLConstant.cs" />
<Compile Include="Dynamo.SwiftLang\SLLine.cs" />
<Compile Include="Dynamo.SwiftLang\ISLStatement.cs" />
<Compile Include="Dynamo.SwiftLang\ISLLineable.cs" />
<Compile Include="Dynamo.SwiftLang\SLTupleExpr.cs" />
<Compile Include="Dynamo.SwiftLang\SLCodeBlock.cs" />
<Compile Include="Dynamo.SwiftLang\SLFunc.cs" />
<Compile Include="Dynamo.CSLang\CSInheritance.cs" />
<Compile Include="Dynamo.CSLang\CSClass.cs" />
<Compile Include="Dynamo.SwiftLang\SLClass.cs" />
<Compile Include="Dynamo.SwiftLang\SLFile.cs" />
<Compile Include="Dynamo.SwiftLang\SLDeclaration.cs" />
<Compile Include="Dynamo.SwiftLang\SLImport.cs" />
<Compile Include="Dynamo.SwiftLang\SLFunctionCall.cs" />
<Compile Include="Dynamo.SwiftLang\SLArgument.cs" />
<Compile Include="DelegatedCommaListElementCollection.cs" />
<Compile Include="Dynamo.SwiftLang\SLSubscriptExpr.cs" />
<Compile Include="Dynamo.CSLang\CSEnum.cs" />
<Compile Include="Dynamo.SwiftLang\SLSwitch.cs" />
<Compile Include="Dynamo.SwiftLang\SLClosure.cs" />
<Compile Include="Dynamo.SwiftLang\SLClosureCall.cs" />
<Compile Include="Dynamo.SwiftLang\SLTryBang.cs" />
<Compile Include="Dynamo.SwiftLang\SLIfElse.cs" />
<Compile Include="Dynamo.SwiftLang\SLThrow.cs" />
<Compile Include="Dynamo.CSLang\CSThrow.cs" />
<Compile Include="Dynamo.SwiftLang\SLInheritance.cs" />
<Compile Include="Dynamo.SwiftLang\SLAttribute.cs" />
<Compile Include="Dynamo.SwiftLang\SLAddressOf.cs" />
<Compile Include="Dynamo.SwiftLang\SLNamedClosureCall.cs" />
<Compile Include="Dynamo.SwiftLang\SLPostBang.cs" />
<Compile Include="Dynamo.CSLang\CSDelegateTypeDecl.cs" />
<Compile Include="Dynamo.CSLang\CSLambda.cs" />
<Compile Include="Dynamo.CSLang\CSTernary.cs" />
<Compile Include="Dynamo.SwiftLang\SLProperty.cs" />
<Compile Include="Dynamo.SwiftLang\SLSubscript.cs" />
<Compile Include="Dynamo.CSLang\CSIndexExpression.cs" />
<Compile Include="Dynamo.CSLang\CSInterface.cs" />
<Compile Include="Dynamo.CSLang\CSArray1D.cs" />
<Compile Include="Dynamo.CSLang\CSUnaryExpression.cs" />
<Compile Include="Dynamo.CSLang\CSFixed.cs" />
<Compile Include="Dynamo.SwiftLang\SLGenericTypeDeclaration.cs" />
<Compile Include="Dynamo.SwiftLang\SLGenericConstraint.cs" />
<Compile Include="Dynamo.CSLang\CSGenericTypeDeclaration.cs" />
<Compile Include="Dynamo.CSLang\CSGenericConstraint.cs" />
<Compile Include="Dynamo.SwiftLang\SLVariadicExpr.cs" />
<Compile Include="Dynamo.SwiftLang\SLCommaListExpr.cs" />
<Compile Include="Dynamo.CSLang\CSTryCatch.cs" />
<Compile Include="Dynamo.SwiftLang\SLDoCatch.cs" />
<Compile Include="Dynamo.SwiftLang\SLAsExpr.cs" />
<Compile Include="Dynamo.SwiftLang\SLLetMatch.cs" />
<Compile Include="Dynamo.CSLang\CSForEach.cs" />
<Compile Include="Dynamo.SwiftLang\SLUnaryExpr.cs" />
<Compile Include="Dynamo.SwiftLang\SLLineableOperator.cs" />
<Compile Include="Dynamo.SwiftLang\SLParameter.cs" />
<Compile Include="Dynamo.SwiftLang\SLParameterList.cs" />
<Compile Include="Dynamo.SwiftLang\SLParenthesisExpression.cs" />
<Compile Include="Dynamo.SwiftLang\SLConditionalCompilation.cs" />
<Compile Include="Dynamo.SwiftLang\SLComment.cs" />
<Compile Include="Dynamo.CSLang\CSInitializer.cs" />
<Compile Include="Dynamo.CSLang\CSConditionalCompilation.cs" />
<Compile Include="Dynamo.CSLang\CSInject.cs" />
<Compile Include="Dynamo.SwiftLang\SLInject.cs" />
<Compile Include="Dynamo.CSLang\CSShortCircuit.cs" />
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<ItemGroup>
<Folder Include="Dynamo.CSLang\" />
<Folder Include="Dynamo.SwiftLang\" />
</ItemGroup>
<ItemGroup>
<Reference Include="System" />
</ItemGroup>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<OutputType>Library</OutputType>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<OutputPath>bin\Debug</OutputPath>
<DefineConstants>DEBUG;</DefineConstants>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These are default values and can be removed.

<ConsolePause>false</ConsolePause>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<OutputPath>bin\Release</OutputPath>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These are default values and can be removed.

<ConsolePause>false</ConsolePause>
</PropertyGroup>
<ItemGroup>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Subfolders are included by default; these can probably be removed.

<Folder Include="Dynamo.CSLang\" />
<Folder Include="Dynamo.SwiftLang\" />
</ItemGroup>
</Project>
34 changes: 17 additions & 17 deletions Dynamo/Dynamo.sln
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2012
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Dynamo", "Dynamo.csproj", "{D0E2964B-34C9-4FEE-A638-A10E2E4A0917}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{D0E2964B-34C9-4FEE-A638-A10E2E4A0917}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{D0E2964B-34C9-4FEE-A638-A10E2E4A0917}.Debug|Any CPU.Build.0 = Debug|Any CPU
{D0E2964B-34C9-4FEE-A638-A10E2E4A0917}.Release|Any CPU.ActiveCfg = Release|Any CPU
{D0E2964B-34C9-4FEE-A638-A10E2E4A0917}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
EndGlobal

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2012
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Dynamo", "Dynamo.csproj", "{D0E2964B-34C9-4FEE-A638-A10E2E4A0917}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{D0E2964B-34C9-4FEE-A638-A10E2E4A0917}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{D0E2964B-34C9-4FEE-A638-A10E2E4A0917}.Debug|Any CPU.Build.0 = Debug|Any CPU
{D0E2964B-34C9-4FEE-A638-A10E2E4A0917}.Release|Any CPU.ActiveCfg = Release|Any CPU
{D0E2964B-34C9-4FEE-A638-A10E2E4A0917}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
EndGlobal
2 changes: 1 addition & 1 deletion Dynamo/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
// The form "{Major}.{Minor}.*" will automatically update the build and revision,
// and "{Major}.{Minor}.{Build}.*" will update just the revision.

[assembly: AssemblyVersion ("1.0.*")]
[assembly: AssemblyVersion ("1.0.0")]

// The following attributes are used to specify the signing key for the assembly,
// if desired. See the Mono documentation for more information about signing.
Expand Down
12 changes: 6 additions & 6 deletions Make.config
Original file line number Diff line number Diff line change
Expand Up @@ -42,14 +42,14 @@ MAX_MONO_VERSION=6.12.0.188
MIN_MONO_URL=https://download.mono-project.com/archive/6.12.0/macos-10-universal/MonoFramework-MDK-6.12.0.90.macos10.xamarin.universal.pkg

# XI version we need
MIN_XI_VERSION=13.18.2.1
MAX_XI_VERSION=13.18.2.1
MIN_XI_URL=https://download.visualstudio.microsoft.com/download/pr/68ffa29a-6a5b-41f7-af7b-506ddcf4bbfc/35159cac3be1910e87309c0094a8ec8a/xamarin.ios-13.18.2.1.pkg
MIN_XI_VERSION=16.4.0.23
MAX_XI_VERSION=16.4.0.23
MIN_XI_URL=https://download.visualstudio.microsoft.com/download/pr/6dea2e56-3063-42bf-9c65-4da93a8902c5/9e47ce909f4adbafaf7978cb6a39e3b5/xamarin.ios-16.4.0.23.pkg

# XM version we need
MIN_XM_VERSION=6.22.1.26
MAX_XM_VERSION=6.22.1.26
MIN_XM_URL=https://download.visualstudio.microsoft.com/download/pr/68caeaf6-39d4-4b9b-85e3-d20c0a123d1e/3fd74515e676be1f528bd4bec104ca6c/xamarin.mac-6.22.1.26.pkg
MIN_XM_VERSION=9.3.0.23
MAX_XM_VERSION=9.3.0.23
MIN_XM_URL=https://download.visualstudio.microsoft.com/download/pr/6dea2e56-3063-42bf-9c65-4da93a8902c5/414da4fd5cb1fac5e167f15927c28943/xamarin.mac-9.3.0.23.pkg

# Minimum macOS version for building
MIN_MACOS_BUILD_VERSION=10.15
Expand Down
Loading