Skip to content

Commit 986e4f0

Browse files
authored
Merge pull request #5 from roboter/feature/publish-release-workflow-2267251993978408117
Feature/publish release workflow 2267251993978408117
2 parents e0eca8c + 89b86a6 commit 986e4f0

10 files changed

Lines changed: 6 additions & 11 deletions

File tree

CSharpCad.UnitTests/CSharpCad.UnitTests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
44
<TargetFrameworks Condition="'$(OS)' == 'Windows_NT'">$(NetVersion);$(NetVersion)-windows</TargetFrameworks>

MatterCadGui/CsgEdtors/CsgEditorCylinder.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ public CsgEditorCylinder(Cylinder.CylinderPrimitive target)
1212
this.target = target;
1313

1414
AddChild(new TextWidget("Cylinder R1,R2,H,S"));
15-
15+
1616
AddNumberEdit(target.Radius1, (val) => target.Radius1 = val, 0);
1717
AddNumberEdit(target.Radius2, (val) => target.Radius2 = val, 1);
1818
AddNumberEdit(target.Height, (val) => target.Height = val, 2);

MatterCadGui/MatterCadGui.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public static void Main(string[] args)
3131
{
3232
AggContext.Config.ProviderTypes.SystemWindowProvider = "MatterHackers.GlfwProvider.GlfwWindowProvider, MatterHackers.GlfwProvider";
3333
}
34-
34+
3535
MatterCadGui cadWindow = new MatterCadGui(true)
3636
{
3737
UseOpenGL = true,

OpenSharpCAD/MainWindow.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -267,4 +267,3 @@ private MatterHackers.PolygonMesh.Mesh Pyramid()
267267

268268
}
269269
}
270-

OpenSharpCAD/OpenSharpCAD.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@
7070
</BootstrapperPackage>
7171
</ItemGroup>
7272
<ItemGroup>
73-
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
73+
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
7474
<PackageReference Include="Microsoft.DotNet.UpgradeAssistant.Extensions.Default.Analyzers" Version="0.3.310801">
7575
<PrivateAssets>all</PrivateAssets>
7676
</PackageReference>

glfw/3.4/LICENSE.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,3 @@ freely, subject to the following restrictions:
2020

2121
3. This notice may not be removed or altered from any source
2222
distribution.
23-

glfw/3.4/README.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -455,4 +455,3 @@ request, please file it in the
455455

456456
Finally, if you're interested in helping out with the development of GLFW or
457457
porting it to your favorite platform, join us on the forum or GitHub.
458-

glfw/3.4/include/GLFW/glfw3.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1131,7 +1131,7 @@ extern "C" {
11311131
#define GLFW_WIN32_SHOWDEFAULT 0x00025002
11321132
/*! @brief Wayland specific
11331133
* [window hint](@ref GLFW_WAYLAND_APP_ID_hint).
1134-
*
1134+
*
11351135
* Allows specification of the Wayland app_id.
11361136
*/
11371137
#define GLFW_WAYLAND_APP_ID 0x00026001
@@ -6544,4 +6544,3 @@ GLFWAPI VkResult glfwCreateWindowSurface(VkInstance instance, GLFWwindow* window
65446544
#endif
65456545

65466546
#endif /* _glfw3_h_ */
6547-

glfw/3.4/include/GLFW/glfw3native.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -660,4 +660,3 @@ GLFWAPI OSMesaContext glfwGetOSMesaContext(GLFWwindow* window);
660660
#endif
661661

662662
#endif /* _glfw3_native_h_ */
663-

glfw/3.4/lib/pkgconfig/glfw3.pc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Name: GLFW
77
Description: A multi-platform library for OpenGL, window and input
88
Version: 3.4.0
99
URL: https://www.glfw.org/
10-
Requires.private:
10+
Requires.private:
1111
Libs: -L${libdir} -lglfw
1212
Libs.private: -framework Cocoa -framework IOKit -framework CoreFoundation
1313
Cflags: -I${includedir}

0 commit comments

Comments
 (0)