Skip to content
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

Jump to bottom

preRelease #325

Merged
merged 7 commits into from
Nov 14, 2021
Merged

preRelease #325

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
63fc264
Bump System.Management from 5.0.0 to 6.0.0 in /src
dependabot[bot] Nov 8, 2021
d2d9a24
Bump Microsoft.SourceLink.GitHub from 1.1.0 to 1.1.1 in /src
dependabot[bot] Nov 11, 2021
95e9098
Merge pull request #324 from XAMLMarkupExtensions/dependabot/nuget/sr…
konne Nov 14, 2021
6d73a5f
Merge pull request #319 from XAMLMarkupExtensions/dependabot/nuget/sr…
konne Nov 14, 2021
3b91746
Bump System.Drawing.Common from 5.0.2 to 6.0.0 in /src
dependabot[bot] Nov 14, 2021
e531099
fix: Fileversion
konne Nov 14, 2021
7ed4a67
Merge pull request #320 from XAMLMarkupExtensions/dependabot/nuget/sr…
konne Nov 14, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/publish.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:

- name: Create msbuild params
run: |
echo "::set-output name=params::${{ github.event.repository.name }}.csproj -verbosity:minimal /p:Configuration=Release /property:DisableGitVersionTask=true /property:GitVersion_NuGetVersion=${{ github.event.release.tag_name }}"
echo "::set-output name=params::${{ github.event.repository.name }}.csproj -verbosity:minimal /p:Configuration=Release /property:DisableGitVersionTask=true /property:GitVersion_NuGetVersion=${{ github.event.release.tag_name }} /property:Version=${{ github.event.release.tag_name }}"
id: msbuild

- name: add nuget API Key for releases
Expand Down
6 changes: 3 additions & 3 deletions src/WPFLocalizeExtension.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,13 +77,13 @@

<!--References for .Net Core 3.x-->
<ItemGroup Condition="$(TargetFramework.StartsWith('netcore'))">
<PackageReference Include="System.Management" Version="5.0.0" />
<PackageReference Include="System.Drawing.Common" Version="5.0.2" />
<PackageReference Include="System.Management" Version="6.0.0" />
<PackageReference Include="System.Drawing.Common" Version="6.0.0" />
</ItemGroup>

<!--PackageReference for all framworks-->
<ItemGroup>
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.0" PrivateAssets="All" />
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
<PackageReference Include="GitVersion.MsBuild" Version="5.7.0" PrivateAssets="all" />
</ItemGroup>

Expand Down