Skip to content

Commit

Permalink
Merge branch 'main' into linux
Browse files Browse the repository at this point in the history
  • Loading branch information
SimonCropp committed Jan 29, 2025
2 parents 4d461ff + b383663 commit 4e62810
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
2 changes: 1 addition & 1 deletion src/Directory.Build.props
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project>
<PropertyGroup>
<Version>7.14.0</Version>
<Version>7.15.0</Version>
<AssemblyVersion>1.0.0</AssemblyVersion>
<PackageTags>Polyfill</PackageTags>
<DisableImplicitNamespaceImports>true</DisableImplicitNamespaceImports>
Expand Down
3 changes: 2 additions & 1 deletion src/appveyor.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
image:
- Visual Studio 2022
#- macOS
- Ubuntu
- macOS
environment:
DOTNET_NOLOGO: true
DOTNET_CLI_TELEMETRY_OPTOUT: true
Expand All @@ -18,6 +18,7 @@ build_script:
sudo chmod u+x dotnet-install.sh
if ($isMacOS) {
sudo ./dotnet-install.sh --jsonfile src/global.json --architecture x64 --install-dir '/usr/local/share/dotnet'
sudo ./dotnet-install.sh --version 5.0.408 --architecture x64 --install-dir '/usr/local/share/dotnet'
} else {
sudo ./dotnet-install.sh --jsonfile src/global.json --architecture x64 --install-dir '/usr/share/dotnet'
sudo ./dotnet-install.sh --version 5.0.408 --architecture x64 --install-dir '/usr/share/dotnet'
Expand Down

0 comments on commit 4e62810

Please sign in to comment.