Skip to content

Windows: Publish 3.10.3. Removed Sync button. Fixed sync image resource. #patch #47

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jan 18, 2025
Merged

Windows: Publish 3.10.3. Removed Sync button. Fixed sync image resource. #patch #47

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ccc8a66
Windows: Publish 3.10.3. Removed Sync button. Fixed sync image resour…
skst Jan 18, 2025
00aeffe
Workflow: Fixed .NET build. #patch
skst Jan 18, 2025
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
4 changes: 2 additions & 2 deletions .github/workflows/dotnet.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ jobs:
# https://docs.microsoft.com/en-us/dotnet/core/tools/
- name: Build
working-directory: ./Windows.Source
run: dotnet build ${{env.SOLUTION_FILE_PATH}} --nologo --self-contained --configuration ${{env.BUILD_CONFIGURATION}} --runtime win-x64 --property:DefineConstants=LICENSING
run: dotnet build ${{env.SOLUTION_FILE_PATH}} --nologo --self-contained --configuration ${{env.BUILD_CONFIGURATION}} --runtime win-x64 --property:DefineConstants="LICENSING MY_WINDOWS_WPF"

- name: Test
working-directory: ./Windows.Source
Expand All @@ -89,7 +89,7 @@ jobs:
- name: Build single-file deployment
working-directory: ./Windows.Source
# Publish to sibling `release` folder for github-tag-action step.
run: dotnet publish ${{env.SOLUTION_FILE_PATH}} --property:PublishProfile=FolderProfile --property:DefineConstants=LICENSING --output ../release/
run: dotnet publish ${{env.SOLUTION_FILE_PATH}} --property:PublishProfile=FolderProfile --property:DefineConstants="LICENSING MY_WINDOWS_WPF" --output ../release/

- name: Copy Files to Publish
run: |
Expand Down
4 changes: 3 additions & 1 deletion Windows.Source/CalculateX/CalculateX.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<PackageIcon>CalculateX.png</PackageIcon>
<Platforms>AnyCPU;x64;x86</Platforms>
<PackageReadmeFile>README.md</PackageReadmeFile>
<Version>3.10.2</Version>
<Version>3.10.3</Version>
<SupportedOSPlatformVersion>10.0.20348.0</SupportedOSPlatformVersion>
</PropertyGroup>

Expand Down Expand Up @@ -55,6 +55,7 @@
<ItemGroup>
<None Remove="Calculator.snk" />
<None Remove="Resources\add.png" />
<None Remove="Resources\arrow_refresh.png" />
<None Remove="Resources\delete.png" />
<None Remove="Resources\pencil.png" />
</ItemGroup>
Expand All @@ -78,6 +79,7 @@

<ItemGroup>
<Resource Include="Resources\add.png" />
<Resource Include="Resources\arrow_refresh.png" />
<Resource Include="Resources\delete.png" />
<Resource Include="Resources\pencil.png" />
</ItemGroup>
Expand Down
6 changes: 4 additions & 2 deletions Windows.Source/CalculateX/MainWindow.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
xmlns:shared="clr-namespace:Shared"
xmlns:props="clr-namespace:CalculateX.Properties"
mc:Ignorable="d"
Title="Calculate X by 12noon" Width="450" Height="350"
Title="Calculate X by 12noon LLC" Width="450" Height="350"
>
<!-- We cannot create the view-model in XAML because we need to pass it the storage path.
<Window.DataContext>
Expand Down Expand Up @@ -60,7 +60,7 @@
</Grid.RowDefinitions>

<Grid Grid.Row="0" Grid.Column="0">
<UniformGrid Columns="4">
<UniformGrid Columns="3">
<Button Margin="4" Padding="2" Background="WhiteSmoke" Command="{Binding AddWorkspaceCommand}">
<Image Margin="0" Source="/CalculateX;component/Resources/add.png" Stretch="None" />
</Button>
Expand All @@ -70,9 +70,11 @@
<Button Margin="4" Padding="2" Background="WhiteSmoke" Command="{Binding DeleteSelectedWorkspaceCommand}">
<Image Margin="0" Source="/CalculateX;component/Resources/delete.png" Stretch="None" />
</Button>
<!--
<Button Margin="4" Padding="2" Background="WhiteSmoke" Click="SynchronizeWorkspaces_Clicked">
<Image Margin="0" Source="/CalculateX;component/Resources/arrow_refresh.png" Stretch="None" />
</Button>
-->
</UniformGrid>
</Grid>

Expand Down
Loading