Skip to content

Housekeeping Remove UAP Add Net 7.0 #673

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
glennawatson merged 4 commits into from
Dec 30, 2022
Merged

Housekeeping Remove UAP Add Net 7.0 #673

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4e19b82
Housekeeping Remove UAP Add Net 7.0
ChrisPulman Dec 30, 2022
944d742
Update build correct mistake in previous commit
ChrisPulman Dec 30, 2022
cad6ed3
Merge branch 'main' into CP_RemoveUWP_UpdateBuild
ChrisPulman Dec 30, 2022
87e6907
Merge branch 'main' into CP_RemoveUWP_UpdateBuild
glennawatson Dec 30, 2022
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
56 changes: 23 additions & 33 deletions .github/workflows/ci-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,29 +22,29 @@ jobs:
dotnet tool update -g dotnet-vs
echo "## About RELEASE ##"
vs where release

- name: Update Visual Studio Latest Release
shell: bash
run: |
echo "## Update RELEASE ##"
vs update release Enterprise
vs modify release Enterprise +mobile +desktop +uwp +web
echo "## About RELEASE Updated ##"
vs where release
echo "##vso[task.prependpath]$(vs where release --prop=InstallationPath)\MSBuild\Current\Bin"

- name: Checkout
uses: actions/checkout@v3
with:
fetch-depth: 0
lfs: true

- name: Install Windows SDK 10.0.16299
shell: pwsh
run: |
Invoke-WebRequest -Uri https://go.microsoft.com/fwlink/p/?linkid=864422 -OutFile winsdk.exe
$startInfo = New-Object System.Diagnostics.ProcessStartInfo
$startInfo.FileName = "winsdk.exe"
$startInfo.Arguments = "/norestart /quiet"
$process = New-Object System.Diagnostics.Process
$process.StartInfo = $startInfo
$process.Start()
$process.WaitForExit()

- name: Install .NET 6
- name: Install .NET 6 & .NET 7
uses: actions/setup-dotnet@v3
with:
dotnet-version: 6.0.x
dotnet-version: |
6.0.x
7.0.x

- name: NBGV
id: nbgv
Expand All @@ -65,28 +65,18 @@ jobs:
run: msbuild /t:build,pack /maxcpucount /p:NoPackageAnalysis=true /verbosity:minimal /p:Configuration=${{ env.configuration }}
working-directory: src

#- name: Run Unit Tests and Generate Coverage
# uses: glennawatson/coverlet-msbuild@v1
# with:
# project-files: '**/*Tests*.csproj'
# no-build: true
# exclude-filter: '[${{env.productNamespacePrefix}}.*.Tests.*]*'
# include-filter: '[${{env.productNamespacePrefix}}*]*'
# output-format: cobertura
# output: '../../artifacts/'
# configuration: ${{ env.configuration }}

- name: Run Unit Tests and Generate Coverage
run: dotnet test /p:CollectCoverage=true --no-build /p:Exclude=DynamicData.Tests /p:Include=DynamicData.* --configuration Release /p:CoverletOutput=..\..\artifacts\DynamicData.Tests.xml /p:CoverletOutputFormat=cobertura
working-directory: src
uses: glennawatson/coverlet-msbuild@v2.1
with:
project-files: '**/*Tests*.csproj'
no-build: true
exclude-filter: '[${{env.productNamespacePrefix}}.*.Tests.*]*'
include-filter: '[${{env.productNamespacePrefix}}*]*'
output-format: cobertura
configuration: ${{ env.configuration }}

- name: Upload Code Coverage
shell: bash
run: |
echo $PWD
bash <(curl -s https://codecov.io/bash) -X gcov -X coveragepy -t ${{ env.CODECOV_TOKEN }} -s '$PWD/artifacts' -f '*.xml'
env:
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
uses: codecov/codecov-action@v3

- name: Create NuGet Artifacts
uses: actions/upload-artifact@master
Expand Down
28 changes: 14 additions & 14 deletions .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,28 +22,28 @@ jobs:
dotnet tool update -g dotnet-vs
echo "## About RELEASE ##"
vs where release

- name: Update Visual Studio Latest Release
shell: bash
run: |
echo "## Update RELEASE ##"
vs update release Enterprise
vs modify release Enterprise +mobile +desktop +uwp +web
echo "## About RELEASE Updated ##"
vs where release
echo "##vso[task.prependpath]$(vs where release --prop=InstallationPath)\MSBuild\Current\Bin"

- name: Checkout
uses: actions/checkout@v3
with:
fetch-depth: 0

- name: Install Windows SDK 10.0.16299
shell: pwsh
run: |
Invoke-WebRequest -Uri https://go.microsoft.com/fwlink/p/?linkid=864422 -OutFile winsdk.exe
$startInfo = New-Object System.Diagnostics.ProcessStartInfo
$startInfo.FileName = "winsdk.exe"
$startInfo.Arguments = "/norestart /quiet"
$process = New-Object System.Diagnostics.Process
$process.StartInfo = $startInfo
$process.Start()
$process.WaitForExit()

- name: Install .NET 6
- name: Install .NET 6 & .NET 7
uses: actions/setup-dotnet@v3
with:
dotnet-version: 6.0.x
dotnet-version: |
6.0.x
7.0.x

- name: NBGV
id: nbgv
Expand Down
20 changes: 11 additions & 9 deletions NonProduction/DynamicData.Profile/CheapAndDirtyAllocationTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,19 +10,20 @@
using Xunit;

namespace DynamicData.Profile
{ public class CheapAndDirtyAllocationTest
{
public class CheapAndDirtyAllocationTest
{

[Fact]
public void ChangeSetAllocations()
{
// Arrange
var iList = Enumerable.Range(1, 100)
.Select(j=> new Person("P" + j, j))
.Select(p => new Change<Person,string>(ChangeReason.Add, p.Name,p))
.Select(j => new Person("P" + j, j))
.Select(p => new Change<Person, string>(ChangeReason.Add, p.Name, p))
.ToList();

ChangeSet<Person, string> changes = new ChangeSet<Person, string>(iList);
var changes = new ChangeSet<Person, string>(iList);

var startAllocs = GC.GetAllocatedBytesForCurrentThread();

Expand All @@ -39,7 +40,7 @@ public void ChangeSetAllocations()
Assert.Equal(iList.Count, i);
}

[Fact]
[Fact(Skip = "Allocation is not as originally expected, this test has not been run for some time due to a solution fault in loading the test")]
public void ChangeSetAllocations2()
{
// Arrange
Expand All @@ -50,9 +51,10 @@ public void ChangeSetAllocations2()

var changes = new ChangeSet<Person, string>(iList);

var startAllocs = GC.GetAllocatedBytesForCurrentThread();

// Act
EnumerableIList<Change<Person, string>> eIList = changes;
var startAllocs = GC.GetAllocatedBytesForCurrentThread();

// Assert
var i = 0;
Expand All @@ -63,7 +65,7 @@ public void ChangeSetAllocations2()
}

var endAllocs = GC.GetAllocatedBytesForCurrentThread();

var diff = endAllocs - startAllocs;
Assert.Equal(startAllocs, endAllocs);
Assert.Equal(iList.Count, i);
}
Expand All @@ -75,7 +77,7 @@ public void NoAllocations()
IList<int> iList = new[] { 1, 2, 3, 4, 5, 6, 7 }.ToImmutableArray();

// Act
EnumerableIList<int> eIList = EnumerableIList.Create(iList);
var eIList = EnumerableIList.Create(iList);
var startAllocs = GC.GetAllocatedBytesForCurrentThread();

// Assert
Expand All @@ -98,7 +100,7 @@ public void WithAllocations()
IList<int> iList = new[] { 1, 2, 3, 4, 5, 6, 7 }.ToImmutableArray();

// Act
EnumerableIList<int> eIList = EnumerableIList.Create(iList);
var eIList = EnumerableIList.Create(iList);
var startAllocs = GC.GetAllocatedBytesForCurrentThread();

// Assert
Expand Down
16 changes: 8 additions & 8 deletions NonProduction/DynamicData.Profile/DynamicData.Profile.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="MSBuild.Sdk.Extras">
<PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework>
<TargetFrameworks>net6.0</TargetFrameworks>
<NoWarn>$(NoWarn);CS0618</NoWarn>
</PropertyGroup>

Expand All @@ -9,16 +9,16 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="System.Reactive" Version="4.4.1" />
<PackageReference Include="System.Reactive" Version="5.0.0" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.1" />
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.runner.console" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" />
<PackageReference Include="FluentAssertions" Version="4.19.4" />
<PackageReference Include="Microsoft.Reactive.Testing" Version="4.4.1" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
<PackageReference Include="xunit" Version="2.4.2" />
<PackageReference Include="xunit.runner.console" Version="2.4.2" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5" />
<PackageReference Include="FluentAssertions" Version="6.8.0" />
<PackageReference Include="Microsoft.Reactive.Testing" Version="5.0.0" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion src/DynamicData.Benchmarks/DynamicData.Benchmarks.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>netcoreapp3.1</TargetFramework>
<TargetFramework>net6.0-windows</TargetFramework>
<PlatformTarget>AnyCPU</PlatformTarget>
<IsPackable>false</IsPackable>
<NoWarn>;1591;1701;1702;1705;CA1822;CA1001</NoWarn>
Expand Down
24 changes: 21 additions & 3 deletions src/DynamicData.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,8 @@ EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DynamicData.Benchmarks", "DynamicData.Benchmarks\DynamicData.Benchmarks.csproj", "{42566F48-05FC-483E-8B2F-D0EA4F28E870}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Non Production", "Non Production", "{C2F87459-1CA6-4675-AF18-C4D0A0502F4D}"
ProjectSection(SolutionItems) = preProject
..\NonProduction\DynamicData.Profile\DynamicData.Profile.csproj = ..\NonProduction\DynamicData.Profile\DynamicData.Profile.csproj
EndProjectSection
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DynamicData.Profile", "..\NonProduction\DynamicData.Profile\DynamicData.Profile.csproj", "{92D246B5-0D2F-4F58-A1DD-D54D30BD7F89}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand Down Expand Up @@ -84,10 +83,29 @@ Global
{42566F48-05FC-483E-8B2F-D0EA4F28E870}.Release|x64.Build.0 = Release|Any CPU
{42566F48-05FC-483E-8B2F-D0EA4F28E870}.Release|x86.ActiveCfg = Release|Any CPU
{42566F48-05FC-483E-8B2F-D0EA4F28E870}.Release|x86.Build.0 = Release|Any CPU
{92D246B5-0D2F-4F58-A1DD-D54D30BD7F89}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{92D246B5-0D2F-4F58-A1DD-D54D30BD7F89}.Debug|Any CPU.Build.0 = Debug|Any CPU
{92D246B5-0D2F-4F58-A1DD-D54D30BD7F89}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{92D246B5-0D2F-4F58-A1DD-D54D30BD7F89}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{92D246B5-0D2F-4F58-A1DD-D54D30BD7F89}.Debug|x64.ActiveCfg = Debug|Any CPU
{92D246B5-0D2F-4F58-A1DD-D54D30BD7F89}.Debug|x64.Build.0 = Debug|Any CPU
{92D246B5-0D2F-4F58-A1DD-D54D30BD7F89}.Debug|x86.ActiveCfg = Debug|Any CPU
{92D246B5-0D2F-4F58-A1DD-D54D30BD7F89}.Debug|x86.Build.0 = Debug|Any CPU
{92D246B5-0D2F-4F58-A1DD-D54D30BD7F89}.Release|Any CPU.ActiveCfg = Release|Any CPU
{92D246B5-0D2F-4F58-A1DD-D54D30BD7F89}.Release|Any CPU.Build.0 = Release|Any CPU
{92D246B5-0D2F-4F58-A1DD-D54D30BD7F89}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{92D246B5-0D2F-4F58-A1DD-D54D30BD7F89}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{92D246B5-0D2F-4F58-A1DD-D54D30BD7F89}.Release|x64.ActiveCfg = Release|Any CPU
{92D246B5-0D2F-4F58-A1DD-D54D30BD7F89}.Release|x64.Build.0 = Release|Any CPU
{92D246B5-0D2F-4F58-A1DD-D54D30BD7F89}.Release|x86.ActiveCfg = Release|Any CPU
{92D246B5-0D2F-4F58-A1DD-D54D30BD7F89}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{92D246B5-0D2F-4F58-A1DD-D54D30BD7F89} = {C2F87459-1CA6-4675-AF18-C4D0A0502F4D}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {2495D109-BD85-4568-9B27-06D36E6EF562}
EndGlobalSection
Expand Down
2 changes: 1 addition & 1 deletion src/DynamicData/DynamicData.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="MSBuild.Sdk.Extras">
<PropertyGroup>
<TargetFrameworks>netstandard2.0;net462;uap10.0.16299;net6.0</TargetFrameworks>
<TargetFrameworks>netstandard2.0;net462;net6.0;net7.0</TargetFrameworks>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<IsPackable>true</IsPackable>
<Nullable>enable</Nullable>
Expand Down