Skip to content

Commit ee8e18f

Browse files
Merge pull request #1070 from icsharpcode/versionupdates
Web version updates
2 parents 311e1e6 + ee0a02b commit ee8e18f

3 files changed

Lines changed: 34 additions & 31 deletions

File tree

Web/ClientApp/src/index.tsx

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,19 @@
11
import 'bootstrap/dist/css/bootstrap.css';
22
import React from 'react';
33
import ReactDOM from 'react-dom';
4+
import { createRoot } from 'react-dom/client';
45
import { BrowserRouter } from 'react-router-dom';
56
import App from './App';
67
import registerServiceWorker from './registerServiceWorker';
78

89
const baseUrl = document.getElementsByTagName('base')[0].getAttribute('href') || undefined;
9-
const rootElement = document.getElementById('root');
1010

11-
ReactDOM.render(
11+
const container = document.getElementById('root');
12+
const root = createRoot(container!);
13+
14+
root.render(
1215
<BrowserRouter basename={baseUrl}>
1316
<App />
14-
</BrowserRouter>,
15-
rootElement);
17+
</BrowserRouter>);
1618

1719
registerServiceWorker();

Web/Properties/launchSettings.json

Lines changed: 26 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,30 @@
11
{
2-
"iisSettings": {
3-
"windowsAuthentication": false,
4-
"anonymousAuthentication": true,
5-
"iisExpress": {
6-
"applicationUrl": "http://localhost:40163",
7-
"sslPort": 44360
8-
}
2+
"profiles": {
3+
"CodeConverter": {
4+
"commandName": "Project",
5+
"launchBrowser": true,
6+
"launchUrl": "https://localhost:44463/CodeConverter",
7+
"environmentVariables": {
8+
"ASPNETCORE_ENVIRONMENT": "Development",
9+
"ASPNETCORE_HOSTINGSTARTUPASSEMBLIES": "Microsoft.AspNetCore.SpaProxy"
10+
},
11+
"applicationUrl": "https://localhost:7183;http://localhost:5183"
912
},
10-
"profiles": {
11-
"CodeConverter": {
12-
"commandName": "Project",
13-
"launchBrowser": true,
14-
"applicationUrl": "https://localhost:7183;http://localhost:5183",
15-
"environmentVariables": {
16-
"ASPNETCORE_ENVIRONMENT": "Development",
17-
"ASPNETCORE_HOSTINGSTARTUPASSEMBLIES": "Microsoft.AspNetCore.SpaProxy"
18-
}
19-
},
20-
"IIS Express": {
21-
"commandName": "IISExpress",
22-
"launchBrowser": true,
23-
"environmentVariables": {
24-
"ASPNETCORE_ENVIRONMENT": "Development",
25-
"ASPNETCORE_HOSTINGSTARTUPASSEMBLIES": "Microsoft.AspNetCore.SpaProxy"
26-
}
27-
}
13+
"IIS Express": {
14+
"commandName": "IISExpress",
15+
"launchBrowser": true,
16+
"environmentVariables": {
17+
"ASPNETCORE_ENVIRONMENT": "Development",
18+
"ASPNETCORE_HOSTINGSTARTUPASSEMBLIES": "Microsoft.AspNetCore.SpaProxy"
19+
}
2820
}
21+
},
22+
"iisSettings": {
23+
"windowsAuthentication": false,
24+
"anonymousAuthentication": true,
25+
"iisExpress": {
26+
"applicationUrl": "http://localhost:40163",
27+
"sslPort": 44360
28+
}
29+
}
2930
}

Web/Web.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22

33
<PropertyGroup>
4-
<TargetFramework>net6.0</TargetFramework>
4+
<TargetFramework>net8.0</TargetFramework>
55
<RootNamespace>ICSharpCode.CodeConverter.Web</RootNamespace>
66
<AssemblyName>ICSharpCode.CodeConverter.Web</AssemblyName>
77
<TypeScriptCompileBlocked>true</TypeScriptCompileBlocked>
@@ -21,7 +21,7 @@
2121

2222
<ItemGroup>
2323
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="6.0.0" />
24-
<PackageReference Include="Microsoft.AspNetCore.SpaProxy" Version="7.0.1" />
24+
<PackageReference Include="Microsoft.AspNetCore.SpaProxy" Version="8.0.0" />
2525
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.4.0" />
2626
<PackageReference Include="System.Data.SqlClient" Version="4.8.5" />
2727
</ItemGroup>

0 commit comments

Comments
 (0)