-
Notifications
You must be signed in to change notification settings - Fork 47
Build cleanup #431
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.
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
Build cleanup #431
Changes from 4 commits
Commits
Show all changes
12 commits
Select commit
Hold shift + click to select a range
570114c
Build cleanup:
mgravell 7b011d9
revert NBGV
mgravell c7cafe7
Use simple TFMs to make build happy
mgravell 605672e
use redis.io as the project url
mgravell 05abfff
Fixup build to clean state (#432)
mgravell 685441a
Merge branch 'master' into marc/build-cleanup
mgravell 44a4758
missed merge
mgravell 6e39fcc
Merge branch 'master' into marc/build-cleanup
mgravell 4e5e546
add missing 0 from test; enable net9
mgravell 785cf1f
migrate upstream tests
mgravell 2dfe3d9
mark API changes as shipped
mgravell cd28663
re-establish log fixture, and ensure it can't be overlooked in the fu…
mgravell File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,44 @@ | ||
| <Project> | ||
| <PropertyGroup> | ||
| <Copyright>2022- Redis, inc.</Copyright> | ||
| <Nullable>enable</Nullable> | ||
| <LangVersion>latest</LangVersion> | ||
| <ImplicitUsings>enable</ImplicitUsings> | ||
| <Authors>Redis Open Source</Authors> | ||
| <Owners>Redis OSS</Owners> | ||
| <Description>.Net Client for Redis Stack</Description> | ||
| <PackageLicenseExpression>MIT</PackageLicenseExpression> | ||
| <RepositoryType>git</RepositoryType> | ||
| <RepositoryUrl>https://github.com/redis/nRedisStack/</RepositoryUrl> | ||
| <PackageReleaseNotes>https://github.com/redis/NRedisStack/releases</PackageReleaseNotes> | ||
| <PackageProjectUrl>https://redis.io/docs/latest/develop/clients/dotnet/</PackageProjectUrl> | ||
| <Deterministic>false</Deterministic> | ||
| <DebugSymbols>true</DebugSymbols> | ||
| <DebugType>embedded</DebugType> | ||
| <DefaultLanguage>en-US</DefaultLanguage> | ||
| <IncludeSymbols>false</IncludeSymbols> | ||
| <PublishRepositoryUrl>true</PublishRepositoryUrl> | ||
| <CheckEolTargetFramework>false</CheckEolTargetFramework> | ||
| <SuppressNETCoreSdkPreviewMessage>true</SuppressNETCoreSdkPreviewMessage> | ||
| <SuppressTfmSupportBuildWarnings>true</SuppressTfmSupportBuildWarnings> | ||
| <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally> | ||
| <NoWarn>$(NoWarn);CS1591</NoWarn> | ||
| <IsWindows>$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::get_Windows())))</IsWindows> | ||
| </PropertyGroup> | ||
|
|
||
| <!-- release builds should be deterministic for packaging --> | ||
| <PropertyGroup Condition="'$(Configuration)' == 'Release'"> | ||
| <ContinuousIntegrationBuild>true</ContinuousIntegrationBuild> | ||
| <Deterministic>true</Deterministic> | ||
| <EmbedUntrackedSources>true</EmbedUntrackedSources> | ||
| </PropertyGroup> | ||
| <ItemGroup Condition="'$(Configuration)' == 'Release' and '$(SourceRoot)'==''"> | ||
| <SourceRoot Include="$(MSBuildThisFileDirectory)/"/> | ||
| </ItemGroup> | ||
|
|
||
| <ItemGroup> | ||
| <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" PrivateAssets="All" IncludeAssets="runtime; build; native; contentfiles; analyzers"/> | ||
| <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All"/> | ||
| <!--<PackageReference Include="Nerdbank.GitVersioning" PrivateAssets="all"/>--> | ||
| </ItemGroup> | ||
| </Project> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| <Project> | ||
| <ItemGroup> | ||
| <!-- core build --> | ||
| <PackageVersion Include="Microsoft.CSharp" Version="4.7.0"/> | ||
| <PackageVersion Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.3"/> | ||
| <PackageVersion Include="Microsoft.SourceLink.GitHub" Version="8.0.0"/> | ||
| <PackageVersion Include="Nerdbank.GitVersioning" Version="3.7.115"/> | ||
|
|
||
| <!-- primary library --> | ||
| <PackageVersion Include="NetTopologySuite" Version="2.5.0"/> | ||
| <PackageVersion Include="System.Text.Json" Version="9.0.2"/> | ||
| <PackageVersion Include="StackExchange.Redis" Version="2.8.24"/> | ||
|
|
||
| <!-- tests, etc --> | ||
| <PackageVersion Include="BouncyCastle.Cryptography" Version="2.5.1"/> | ||
| <PackageVersion Include="coverlet.collector" Version="6.0.4"/> | ||
| <PackageVersion Include="coverlet.msbuild" Version="6.0.4"/> | ||
| <PackageVersion Include="dotenv.net" Version="3.2.1"/> | ||
| <PackageVersion Include="GitHubActionsTestLogger" Version="2.4.1"/> | ||
| <PackageVersion Include="Microsoft.Azure.StackExchangeRedis" Version="3.1.0"/> | ||
| <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.12.0"/> | ||
| <PackageVersion Include="Validation" Version="2.6.68"/> | ||
| <PackageVersion Include="xunit" Version="2.9.3"/> | ||
| <PackageVersion Include="xunit.assert" Version="2.9.3"/> | ||
| <PackageVersion Include="xunit.runner.visualstudio" Version="3.0.2"/> | ||
| <PackageVersion Include="Xunit.SkippableFact" Version="1.5.23"/> | ||
| </ItemGroup> | ||
| </Project> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,25 +1,20 @@ | ||
| <Project Sdk="Microsoft.NET.Sdk"> | ||
|
|
||
| <PropertyGroup> | ||
| <Nullable>enable</Nullable> | ||
| <TargetFrameworks>netstandard2.0;net6.0;net7.0;net8.0</TargetFrameworks> | ||
| <GenerateDocumentationFile>true</GenerateDocumentationFile> | ||
| <LangVersion>latest</LangVersion> | ||
| <ImplicitUsings>enable</ImplicitUsings> | ||
| <Authors>Redis Open Source</Authors> | ||
| <Owners>Redis OSS</Owners> | ||
| <Description>.Net Client for Redis Stack</Description> | ||
| <PackageReadmeFile>README.md</PackageReadmeFile> | ||
| <Version>1.0.0-beta1</Version> | ||
| <ReleaseVersion>1.0.0-beta1</ReleaseVersion> | ||
| <PackageVersion>1.0.0-beta1</PackageVersion> | ||
| </PropertyGroup> | ||
|
|
||
| <ItemGroup> | ||
| <PackageReference Include="NetTopologySuite" Version="2.5.0" /> | ||
| <PackageReference Include="System.Text.Json" Version="9.0.2" Condition="'$(TargetFramework)' == 'netstandard2.0'" /> | ||
| <PackageReference Include="StackExchange.Redis" Version="2.8.24" /> | ||
| <None Include="..\..\README.md" Pack="true" PackagePath="\" /> | ||
| </ItemGroup> | ||
| <PropertyGroup> | ||
| <TargetFrameworks>net6.0;net7.0;net8.0;netstandard2.0;net481</TargetFrameworks> | ||
| <GenerateDocumentationFile>true</GenerateDocumentationFile> | ||
| <PackageReadmeFile>README.md</PackageReadmeFile> | ||
| <PackageIcon>Redis.png</PackageIcon> | ||
| <Version>1.0.0-beta1</Version> | ||
| <ReleaseVersion>1.0.0-beta1</ReleaseVersion> | ||
| <PackageVersion>1.0.0-beta1</PackageVersion> | ||
| </PropertyGroup> | ||
|
|
||
| <ItemGroup> | ||
| <PackageReference Include="NetTopologySuite"/> | ||
| <PackageReference Include="StackExchange.Redis"/> | ||
| <PackageReference Include="System.Text.Json" Condition="'$(TargetFramework)' == 'netstandard2.0' or '$(TargetFramework)' == 'net481'"/> | ||
| <None Include="../../Redis.png" Link="Redis.png" Pack="true" PackagePath="/" Visible="false"/> | ||
| <None Include="../../README.md" Link="README.md" Pack="true" PackagePath="/" Visible="false"/> | ||
| </ItemGroup> | ||
| </Project> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,29 +1,24 @@ | ||
| <Project Sdk="Microsoft.NET.Sdk"> | ||
| <PropertyGroup> | ||
| <IsWindows>$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::get_Windows())))</IsWindows> | ||
| <TargetFrameworks Condition=" '$(IsWindows)' == 'true'">net6.0;net7.0;net8.0;net481</TargetFrameworks> | ||
| <TargetFrameworks Condition=" '$(IsWindows)' != 'true'">net6.0;net7.0;net8.0</TargetFrameworks> | ||
| <ImplicitUsings>enable</ImplicitUsings> | ||
| <Nullable>enable</Nullable> | ||
| <LangVersion>latest</LangVersion> | ||
| <IsPackable>false</IsPackable> | ||
| <!-- <OutputType>Module</OutputType> --> | ||
| </PropertyGroup> | ||
| <ItemGroup> | ||
| <PackageReference Include="GitHubActionsTestLogger" Version="2.4.1"> | ||
| <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> | ||
| <PrivateAssets>all</PrivateAssets> | ||
| </PackageReference> | ||
| <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" /> | ||
| <PackageReference Include="xunit" Version="2.9.3" /> | ||
| <PackageReference Include="xunit.runner.visualstudio" Version="3.0.2"> | ||
| <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> | ||
| <PrivateAssets>all</PrivateAssets> | ||
| </PackageReference> | ||
| <PackageReference Include="StackExchange.Redis" Version="2.8.24" /> | ||
| </ItemGroup> | ||
| <ItemGroup> | ||
| <ProjectReference Include="..\..\src\NRedisStack\NRedisStack.csproj" /> | ||
| <ProjectReference Include="..\..\tests\NRedisStack.Tests\NRedisStack.Tests.csproj" /> | ||
| </ItemGroup> | ||
| <PropertyGroup> | ||
| <TargetFrameworks Condition=" '$(IsWindows)' == 'true'">net6.0;net7.0;net8.0;net481</TargetFrameworks> | ||
| <TargetFrameworks Condition=" '$(IsWindows)' != 'true'">net6.0;net7.0;net8.0</TargetFrameworks> | ||
| <IsPackable>false</IsPackable> | ||
| </PropertyGroup> | ||
| <ItemGroup> | ||
| <PackageReference Include="GitHubActionsTestLogger"> | ||
| <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> | ||
| <PrivateAssets>all</PrivateAssets> | ||
| </PackageReference> | ||
| <PackageReference Include="Microsoft.NET.Test.Sdk"/> | ||
| <PackageReference Include="xunit"/> | ||
| <PackageReference Include="xunit.runner.visualstudio"> | ||
| <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> | ||
| <PrivateAssets>all</PrivateAssets> | ||
| </PackageReference> | ||
| <PackageReference Include="StackExchange.Redis"/> | ||
| </ItemGroup> | ||
| <ItemGroup> | ||
| <ProjectReference Include="..\..\src\NRedisStack\NRedisStack.csproj"/> | ||
| <ProjectReference Include="..\..\tests\NRedisStack.Tests\NRedisStack.Tests.csproj"/> | ||
| </ItemGroup> | ||
| </Project> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,55 +1,50 @@ | ||
| <Project Sdk="Microsoft.NET.Sdk"> | ||
| <PropertyGroup> | ||
| <IsWindows>$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::get_Windows())))</IsWindows> | ||
| <TargetFrameworks Condition=" '$(IsWindows)' == 'true'">net6.0;net7.0;net8.0;net481</TargetFrameworks> | ||
| <TargetFrameworks Condition=" '$(IsWindows)' != 'true'">net6.0;net7.0;net8.0</TargetFrameworks> | ||
| <ImplicitUsings>enable</ImplicitUsings> | ||
| <Nullable>enable</Nullable> | ||
| <LangVersion>latest</LangVersion> | ||
| <PropertyGroup> | ||
| <TargetFrameworks Condition=" '$(IsWindows)' == 'true'">net6.0;net7.0;net8.0;net481</TargetFrameworks> | ||
| <TargetFrameworks Condition=" '$(IsWindows)' != 'true'">net6.0;net7.0;net8.0</TargetFrameworks> | ||
| <IsPackable>false</IsPackable> | ||
| </PropertyGroup> | ||
|
|
||
| <IsPackable>false</IsPackable> | ||
| </PropertyGroup> | ||
| <ItemGroup> | ||
| <PackageReference Include="coverlet.collector"> | ||
| <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> | ||
| <PrivateAssets>all</PrivateAssets> | ||
| </PackageReference> | ||
| <PackageReference Include="coverlet.msbuild"> | ||
| <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> | ||
| <PrivateAssets>all</PrivateAssets> | ||
| </PackageReference> | ||
| <PackageReference Include="dotenv.net"/> | ||
| <PackageReference Include="Microsoft.NET.Test.Sdk"/> | ||
| <PackageReference Include="GitHubActionsTestLogger"> | ||
| <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> | ||
| <PrivateAssets>all</PrivateAssets> | ||
| </PackageReference> | ||
| <PackageReference Include="NetTopologySuite"/> | ||
| <PackageReference Include="Validation"/> | ||
| <PackageReference Include="xunit.runner.visualstudio"/> | ||
| <PackageReference Include="StackExchange.Redis"/> | ||
| <PackageReference Include="xunit"/> | ||
| <PackageReference Include="xunit.assert"/> | ||
| <PackageReference Include="BouncyCastle.Cryptography"/> | ||
| <PackageReference Include="Microsoft.Azure.StackExchangeRedis"/> | ||
| <PackageReference Include="Xunit.SkippableFact"/> | ||
| </ItemGroup> | ||
|
|
||
| <ItemGroup> | ||
| <PackageReference Include="coverlet.collector" Version="6.0.4"> | ||
| <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> | ||
| <PrivateAssets>all</PrivateAssets> | ||
| </PackageReference> | ||
| <PackageReference Include="coverlet.msbuild" Version="6.0.4"> | ||
| <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> | ||
| <PrivateAssets>all</PrivateAssets> | ||
| </PackageReference> | ||
| <PackageReference Include="dotenv.net" Version="3.2.1" /> | ||
| <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" /> | ||
| <PackageReference Include="GitHubActionsTestLogger" Version="2.4.1"> | ||
| <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> | ||
| <PrivateAssets>all</PrivateAssets> | ||
| </PackageReference> | ||
| <PackageReference Include="NetTopologySuite" Version="2.5.0" /> | ||
| <PackageReference Include="Validation" Version="2.6.68" /> | ||
| <PackageReference Include="xunit.runner.visualstudio" Version="3.0.2" /> | ||
| <PackageReference Include="StackExchange.Redis" Version="2.8.24" /> | ||
| <PackageReference Include="xunit" Version="2.9.3" /> | ||
| <PackageReference Include="xunit.assert" Version="2.9.3" /> | ||
| <PackageReference Include="BouncyCastle.Cryptography" Version="2.5.1" /> | ||
| <PackageReference Include="Microsoft.Azure.StackExchangeRedis" Version="3.1.0" /> | ||
| <PackageReference Include="Xunit.SkippableFact" Version="1.5.23" /> | ||
| </ItemGroup> | ||
| <ItemGroup> | ||
| <ProjectReference Include="..\..\src\NRedisStack\NRedisStack.csproj"/> | ||
| </ItemGroup> | ||
|
|
||
| <ItemGroup> | ||
| <ProjectReference Include="..\..\src\NRedisStack\NRedisStack.csproj" /> | ||
| </ItemGroup> | ||
| <ItemGroup> | ||
| <None Update="xunit.runner.json"> | ||
| <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> | ||
| </None> | ||
| </ItemGroup> | ||
|
|
||
| <ItemGroup> | ||
| <None Update="xunit.runner.json"> | ||
| <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> | ||
| </None> | ||
| </ItemGroup> | ||
|
|
||
| <ItemGroup> | ||
| <None Include="..\dockers\endpoints.json"> | ||
| <CopyToOutputDirectory>Always</CopyToOutputDirectory> | ||
| </None> | ||
| </ItemGroup> | ||
| <ItemGroup> | ||
| <None Include="..\dockers\endpoints.json"> | ||
| <CopyToOutputDirectory>Always</CopyToOutputDirectory> | ||
| </None> | ||
| </ItemGroup> | ||
|
|
||
| </Project> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,17 @@ | ||
| { | ||
| "version": "1.0", | ||
| "assemblyVersion": "1.0.0.0", | ||
| "publicReleaseRefSpec": [ | ||
| "^refs/heads/main$", | ||
| "^refs/tags/v\\d+\\.\\d+" | ||
| ], | ||
| "nugetPackageVersion": { | ||
| "semVer": 2 | ||
| }, | ||
| "cloudBuild": { | ||
| "buildNumber": { | ||
| "enabled": true, | ||
| "setVersionVariables": true | ||
| } | ||
| } | ||
| } | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
consider changing the way versions handled for release pipeline here in nuget-release
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yep, that would be good to resolve along with NBGV, which is the default/go-to automated versioning tool; however, that was complaining about git checkout - looks like somewhere we're using shallow clone (NBGV needs a bit more to calculate the version via commits), so: that's something we'd need to fix in parallel. I suggest we defer that for now, but yes: that would be a good thing to fix.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
basically: this version.json was "get that process started", but: a cog fell out, so that's slightly incomplete