Skip to content

Commit d7b1afc

Browse files
TomKovacTomKovac
authored
Merge branch 'dev' into 515-build-target-should-be-changed-to-s7generic
2 parents 2a19fa9 + 9fc56bb commit d7b1afc

File tree

11 files changed

+127
-85
lines changed

11 files changed

+127
-85
lines changed

‎.config/dotnet-tools.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"isRoot": true,
44
"tools": {
55
"AXSharp.ixc": {
6-
"version": "0.21.0-alpha.280",
6+
"version": "0.22.0-alpha.288",
77
"commands": [
88
"ixc"
99
],
@@ -17,14 +17,14 @@
1717
"rollForward": false
1818
},
1919
"AXSharp.ixd": {
20-
"version": "0.21.0-alpha.280",
20+
"version": "0.22.0-alpha.288",
2121
"commands": [
2222
"ixd"
2323
],
2424
"rollForward": false
2525
},
2626
"AXSharp.ixr": {
27-
"version": "0.21.0-alpha.280",
27+
"version": "0.22.0-alpha.288",
2828
"commands": [
2929
"ixr"
3030
],

‎cake/Program.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -883,7 +883,7 @@ public override void Run(BuildContext context)
883883
new Cake.Common.Tools.DotNet.NuGet.Push.DotNetNuGetPushSettings()
884884
{
885885
ApiKey = context.GitHubToken,
886-
Source = "https://nuget.pkg.github.com/ix-ax/index.json",
886+
Source = "https://nuget.pkg.github.com/inxton/index.json",
887887
SkipDuplicate = true
888888
});
889889
}
@@ -929,4 +929,4 @@ public override void Run(BuildContext context)
929929
[IsDependentOn(typeof(PublishReleaseTask))]
930930
public class DefaultTask : FrostingTask
931931
{
932-
}
932+
}

‎scripts/check_requisites.ps1‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ $headers = @{
114114
"Accept" = "application/vnd.github.package-preview+json"
115115
}
116116

117-
$feedUrl = "https://nuget.pkg.github.com/ix-ax/index.json"
117+
$feedUrl = "https://nuget.pkg.github.com/inxton/index.json"
118118

119119
# Check if the feed is added
120120
$isFeedAlreadyAdded = $false;

‎src/AXOpen-L1-tests.sln‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Microsoft Visual Studio Solution File, Format Version 12.00
2-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AXOpen-L1-tests", "AXOpen-L1-tests.proj", "{091BFA68-B549-45AF-9857-3932996D7C60}"
2+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen-L1-tests", "AXOpen-L1-tests.proj", "{091BFA68-B549-45AF-9857-3932996D7C60}"
33
EndProject
44
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ix_ax_axopen_abstractions", "abstractions\src\AXOpen.Abstractions\ix_ax_axopen_abstractions.csproj", "{02DDDB95-D6BC-4718-BA35-3454EAB5DF67}"
55
EndProject
@@ -165,7 +165,8 @@ Global
165165
GlobalSection(ProjectConfigurationPlatforms) = postSolution
166166
{091BFA68-B549-45AF-9857-3932996D7C60}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
167167
{091BFA68-B549-45AF-9857-3932996D7C60}.Debug|Any CPU.Build.0 = Debug|Any CPU
168-
{091BFA68-B549-45AF-9857-3932996D7C60}.Release|Any CPU.ActiveCfg = Debug|Any CPU
168+
{091BFA68-B549-45AF-9857-3932996D7C60}.Release|Any CPU.ActiveCfg = Release|Any CPU
169+
{091BFA68-B549-45AF-9857-3932996D7C60}.Release|Any CPU.Build.0 = Release|Any CPU
169170
{02DDDB95-D6BC-4718-BA35-3454EAB5DF67}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
170171
{02DDDB95-D6BC-4718-BA35-3454EAB5DF67}.Debug|Any CPU.Build.0 = Debug|Any CPU
171172
{02DDDB95-D6BC-4718-BA35-3454EAB5DF67}.Release|Any CPU.ActiveCfg = Release|Any CPU

‎src/AXOpen-L2-tests.sln‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,16 @@
11
Microsoft Visual Studio Solution File, Format Version 12.00
2-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AXOpen-L2-tests", "AXOpen-L2-tests.proj", "{9A85BB89-8946-42C7-AEEC-C777BBE31FCA}"
2+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen-L2-tests", "AXOpen-L2-tests.proj", "{9A85BB89-8946-42C7-AEEC-C777BBE31FCA}"
33
EndProject
44
Global
55
GlobalSection(SolutionConfigurationPlatforms) = preSolution
66
Debug|Any CPU = Debug|Any CPU
7+
Release|Any CPU = Release|Any CPU
78
EndGlobalSection
89
GlobalSection(ProjectConfigurationPlatforms) = postSolution
910
{9A85BB89-8946-42C7-AEEC-C777BBE31FCA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
1011
{9A85BB89-8946-42C7-AEEC-C777BBE31FCA}.Debug|Any CPU.Build.0 = Debug|Any CPU
12+
{9A85BB89-8946-42C7-AEEC-C777BBE31FCA}.Release|Any CPU.ActiveCfg = Release|Any CPU
13+
{9A85BB89-8946-42C7-AEEC-C777BBE31FCA}.Release|Any CPU.Build.0 = Release|Any CPU
1114
EndGlobalSection
1215
GlobalSection(SolutionProperties) = preSolution
1316
HideSolutionNode = FALSE

‎src/AXOpen-L3-tests.sln‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Microsoft Visual Studio Solution File, Format Version 12.00
2-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AXOpen-L3-tests", "AXOpen-L3-tests.proj", "{6D090A35-7564-4D14-8531-7081D858A4F3}"
2+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen-L3-tests", "AXOpen-L3-tests.proj", "{6D090A35-7564-4D14-8531-7081D858A4F3}"
33
EndProject
44
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ix_ax_axopen_abstractions", "abstractions\src\AXOpen.Abstractions\ix_ax_axopen_abstractions.csproj", "{64E2240B-1DFE-4939-BB2C-8A40FB81329D}"
55
EndProject
@@ -199,7 +199,8 @@ Global
199199
GlobalSection(ProjectConfigurationPlatforms) = postSolution
200200
{6D090A35-7564-4D14-8531-7081D858A4F3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
201201
{6D090A35-7564-4D14-8531-7081D858A4F3}.Debug|Any CPU.Build.0 = Debug|Any CPU
202-
{6D090A35-7564-4D14-8531-7081D858A4F3}.Release|Any CPU.ActiveCfg = Debug|Any CPU
202+
{6D090A35-7564-4D14-8531-7081D858A4F3}.Release|Any CPU.ActiveCfg = Release|Any CPU
203+
{6D090A35-7564-4D14-8531-7081D858A4F3}.Release|Any CPU.Build.0 = Release|Any CPU
203204
{64E2240B-1DFE-4939-BB2C-8A40FB81329D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
204205
{64E2240B-1DFE-4939-BB2C-8A40FB81329D}.Debug|Any CPU.Build.0 = Debug|Any CPU
205206
{64E2240B-1DFE-4939-BB2C-8A40FB81329D}.Release|Any CPU.ActiveCfg = Release|Any CPU

0 commit comments

Comments
 (0)