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

Fix builds on macOS / Linux using the build.sh script #2937

Merged
merged 1 commit into from
Oct 24, 2024
Merged

Fix builds on macOS / Linux using the build.sh script #2937

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 0 additions & 7 deletions WilsonUnix.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,8 +82,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.IdentityModel.Val
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.IdentityModel.Abstractions.Tests", "test\Microsoft.IdentityModel.Abstractions.Tests\Microsoft.IdentityModel.Abstractions.Tests.csproj", "{4D6D09F9-5343-4831-9623-32089ADB27A0}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.IdentityModel.SampleTests", "test\Microsoft.IdentityModel.SampleTests\Microsoft.IdentityModel.SampleTests.csproj", "{A9A9E808-16A3-4351-A213-09D46883C0F3}"
EndProject
jennyf19 marked this conversation as resolved.
Show resolved Hide resolved
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.IdentityModel.Validators.Tests", "test\Microsoft.IdentityModel.Validators.Tests\Microsoft.IdentityModel.Validators.Tests.csproj", "{17116E4B-B3FE-40A9-A733-1BC00FF5963D}"
EndProject
Global
Expand Down Expand Up @@ -196,10 +194,6 @@ Global
{4D6D09F9-5343-4831-9623-32089ADB27A0}.Debug|Any CPU.Build.0 = Debug|Any CPU
{4D6D09F9-5343-4831-9623-32089ADB27A0}.Release|Any CPU.ActiveCfg = Release|Any CPU
{4D6D09F9-5343-4831-9623-32089ADB27A0}.Release|Any CPU.Build.0 = Release|Any CPU
{A9A9E808-16A3-4351-A213-09D46883C0F3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{A9A9E808-16A3-4351-A213-09D46883C0F3}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A9A9E808-16A3-4351-A213-09D46883C0F3}.Release|Any CPU.ActiveCfg = Release|Any CPU
{A9A9E808-16A3-4351-A213-09D46883C0F3}.Release|Any CPU.Build.0 = Release|Any CPU
{17116E4B-B3FE-40A9-A733-1BC00FF5963D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{17116E4B-B3FE-40A9-A733-1BC00FF5963D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{17116E4B-B3FE-40A9-A733-1BC00FF5963D}.Release|Any CPU.ActiveCfg = Release|Any CPU
Expand Down Expand Up @@ -236,7 +230,6 @@ Global
{6EAA7FED-C053-4AD0-A73B-B96A5593BC49} = {BD2706C5-6C57-484D-89C8-A0CF5F8E3D19}
{BD223874-759C-41AF-BA9E-F4E5D024F395} = {BD2706C5-6C57-484D-89C8-A0CF5F8E3D19}
{4D6D09F9-5343-4831-9623-32089ADB27A0} = {8905D2E3-4499-4A86-BF3E-F098F228DD59}
{A9A9E808-16A3-4351-A213-09D46883C0F3} = {8905D2E3-4499-4A86-BF3E-F098F228DD59}
{17116E4B-B3FE-40A9-A733-1BC00FF5963D} = {8905D2E3-4499-4A86-BF3E-F098F228DD59}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
Expand Down
2 changes: 1 addition & 1 deletion build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ pack() {
echo -e "Pack ...... "
echo -e "===========================================================\n"

dotnet pack --no-build WilsonUnix.sln
dotnet pack --no-build WilsonUnix.sln -c Debug
jennyf19 marked this conversation as resolved.
Show resolved Hide resolved

echo -e "\n"
echo -e "==========================================================="
Expand Down
3 changes: 1 addition & 2 deletions build/common.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,7 @@
<!-- Build symbol package (.snupkg) to distribute the PDB containing Source Link -->
<IncludeSymbols>true</IncludeSymbols>
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
<TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">$(SrcTargets)</TargetFrameworks>
<TargetFrameworks Condition=" '$(OS)' != 'Windows_NT' ">$(SrcStandardTargets)</TargetFrameworks>
<TargetFrameworks>$(SrcTargets)</TargetFrameworks>
jennyf19 marked this conversation as resolved.
Show resolved Hide resolved
<NetStandardImplicitPackageVersion>$(NetStandardVersion)</NetStandardImplicitPackageVersion>
<LangVersion>12</LangVersion>
<EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
Expand Down
3 changes: 1 addition & 2 deletions build/commonTest.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,7 @@
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<WarningsNotAsErrors>0618</WarningsNotAsErrors>
<IsTestProject>true</IsTestProject>
<TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">$(TestTargets)</TargetFrameworks>
<TargetFrameworks Condition=" '$(OS)' != 'Windows_NT' ">$(TestOnlyCoreTargets)</TargetFrameworks>
<TargetFrameworks>$(TestTargets)</TargetFrameworks>
<RuntimeFrameworkVersion Condition=" '$(TargetFramework)' == 'netcoreapp2.1'">$(DotNetCoreAppRuntimeVersion)</RuntimeFrameworkVersion>
<IsPackable>false</IsPackable>
<LangVersion>12</LangVersion>
Expand Down
1 change: 0 additions & 1 deletion build/targets.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,5 @@
<SrcTargets Condition="'$(LocalBuild)' != 'True'">net462;net472;netstandard2.0;net6.0;net8.0</SrcTargets>
<SrcTargets Condition="'$(LocalBuild)' == 'True'">netstandard2.0;net8.0</SrcTargets>
<SrcTargets Condition="'$(TargetNet9)' == 'True'">$(SrcTargets);net9.0</SrcTargets>
<SrcStandardTargets>netstandard2.0</SrcStandardTargets>
</PropertyGroup>
</Project>
1 change: 0 additions & 1 deletion build/targetsTest.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,5 @@
<TestTargets Condition="'$(LocalBuild)' != 'True'">net462;net472;net6.0;net8.0</TestTargets>
<TestTargets Condition="'$(LocalBuild)' == 'True'">net8.0</TestTargets>
<TestTargets Condition="'$(TargetNet9)' == 'True'">$(TestTargets);net9.0</TestTargets>
<TestOnlyCoreTargets>net6.0</TestOnlyCoreTargets>
</PropertyGroup>
</Project>
4 changes: 2 additions & 2 deletions ...dentityModel.AotCompatibility.Tests/Microsoft.IdentityModel.AotCompatibility.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@

<PropertyGroup>
<!-- This test only needs to run on .NET -->
<TargetFramework>net8.0</TargetFramework>
<TargetFrameworks Condition="'$(TargetNet9)'== 'True'">$(TargetFramework); net9.0</TargetFrameworks>
<TargetFrameworks>net8.0</TargetFrameworks>
<TargetFrameworks Condition="'$(TargetNet9)'== 'True'">$(TargetFrameworks);net9.0</TargetFrameworks>
jennyf19 marked this conversation as resolved.
Show resolved Hide resolved
<langversion>12</langversion>
<Version>1.0.0-preview</Version>
</PropertyGroup>
Expand Down
Loading