Skip to content

Commit 89c3897

Browse files
committed
Merge branch 'release_v3_0_0' of github.com:browserstack/browserstack-local-csharp into release_v3_0_0
2 parents 71c2b5a + 4bb9981 commit 89c3897

File tree

3 files changed

+8
-13
lines changed

3 files changed

+8
-13
lines changed

.github/workflows/cd.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ jobs:
2323
msbuild BrowserStackLocalIntegrationTests -t:restore -p:Configuration=Release
2424
msbuild BrowserStackLocalIntegrationTests -t:build -p:Configuration=Release
2525
- name: Setup .NET Core
26-
uses: actions/setup-dotnet@v1
26+
uses: actions/setup-dotnet@v3
2727
with:
28-
dotnet-version: 7.0.20
28+
dotnet-version: 7.0.410
2929
- name: Run Integration Tests
3030
env:
3131
BROWSERSTACK_USERNAME: ${{ secrets.BROWSERSTACK_USERNAME }}

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ jobs:
2323
msbuild BrowserStackLocalIntegrationTests -t:restore -p:Configuration=Release
2424
msbuild BrowserStackLocalIntegrationTests -t:build -p:Configuration=Release
2525
- name: Setup .NET Core
26-
uses: actions/setup-dotnet@v1
26+
uses: actions/setup-dotnet@v3
2727
with:
28-
dotnet-version: 7.0.20
28+
dotnet-version: 7.0.410
2929
- name: Run Integration Tests
3030
env:
3131
BROWSERSTACK_USERNAME: ${{ secrets.BROWSERSTACK_USERNAME }}

BrowserStackLocal/BrowserStackLocal Unit Tests/BrowserStackLocal Unit Tests.csproj

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<PropertyGroup>
33
<RootNamespace>BrowserStackLocal_Unit_Tests</RootNamespace>
44
<AssemblyName>BrowserStackLocal Unit Tests</AssemblyName>
5-
<TargetFrameworks>net45;netcoreapp3.1</TargetFrameworks>
5+
<TargetFrameworks>net7.0</TargetFrameworks>
66
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
77
<Title>BrowserStackLocal Unit Tests</Title>
88
<Product>BrowserStackLocal Unit Tests</Product>
@@ -18,15 +18,10 @@
1818
<PackageReference Include="NUnit3TestAdapter" Version="3.15.1" />
1919
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.4.0" />
2020
</ItemGroup>
21-
<ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">
21+
<ItemGroup Condition=" '$(TargetFramework)' == 'net7.0' ">
2222
<PackageReference Include="System.Threading.Tasks.Extensions" Version="4.5.3" />
2323
<Reference Include="BrowserStackLocal">
24-
<HintPath>..\BrowserStackLocal\bin\Debug\net20\BrowserStackLocal.dll</HintPath>
25-
</Reference>
26-
</ItemGroup>
27-
<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.1' ">
28-
<Reference Include="BrowserStackLocal">
29-
<HintPath>..\BrowserStackLocal\bin\Debug\netstandard2.0\BrowserStackLocal.dll</HintPath>
24+
<HintPath>..\BrowserStackLocal\bin\$(Configuration)\net7.0\BrowserStackLocal.dll</HintPath>
3025
</Reference>
3126
</ItemGroup>
3227
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
@@ -36,4 +31,4 @@
3631
<Target Name="AfterBuild">
3732
</Target>
3833
-->
39-
</Project>
34+
</Project>

0 commit comments

Comments
 (0)